summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support')
-rw-r--r--meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb1
-rw-r--r--meta-oe/recipes-support/anthy/anthy_9100h.bb6
-rw-r--r--meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch37
-rw-r--r--meta-oe/recipes-support/asio/asio/run-ptest19
-rw-r--r--meta-oe/recipes-support/asio/asio_1.30.2.bb19
-rw-r--r--meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch1154
-rw-r--r--meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch67
-rw-r--r--meta-oe/recipes-support/atop/atop/fix-permissions.patch54
-rw-r--r--meta-oe/recipes-support/atop/atop_2.11.0.bb (renamed from meta-oe/recipes-support/atop/atop_2.4.0.bb)19
-rw-r--r--meta-oe/recipes-support/augeas/augeas_1.12.0.bb1
-rw-r--r--meta-oe/recipes-support/avro/avro-c++_1.11.3.bb7
-rw-r--r--meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch59
-rw-r--r--meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch386
-rw-r--r--meta-oe/recipes-support/avro/avro-c_1.11.3.bb12
-rw-r--r--meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch45
-rw-r--r--meta-oe/recipes-support/bcu/bcu_1.1.115.bb22
-rw-r--r--meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb (renamed from meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb)3
-rw-r--r--meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb19
-rw-r--r--meta-oe/recipes-support/boost-sml/boost-sml_1.1.12.bb (renamed from meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb)3
-rw-r--r--meta-oe/recipes-support/btop/btop_1.4.3.bb (renamed from meta-oe/recipes-support/btop/btop_1.3.2.bb)6
-rw-r--r--meta-oe/recipes-support/bvi/bvi_1.4.2.bb17
-rw-r--r--meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb (renamed from meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb)8
-rw-r--r--meta-oe/recipes-support/c-periphery/c-periphery_2.4.3.bb (renamed from meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb)5
-rw-r--r--meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb1
-rw-r--r--meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb1
-rw-r--r--meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb1
-rw-r--r--meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb1
-rw-r--r--meta-oe/recipes-support/ckermit/ckermit_302.bb16
-rw-r--r--meta-oe/recipes-support/cli11/cli11_2.3.2.bb1
-rw-r--r--meta-oe/recipes-support/cmark/cmark_0.31.1.bb (renamed from meta-oe/recipes-support/cmark/cmark_0.31.0.bb)3
-rw-r--r--meta-oe/recipes-support/colord/colord-native.bb2
-rw-r--r--meta-oe/recipes-support/colord/colord.bb32
-rw-r--r--meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch (renamed from meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch)0
-rw-r--r--meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch28
-rw-r--r--meta-oe/recipes-support/colord/colord/Makefile (renamed from meta-oe/recipes-support/colord/colord-native/Makefile)0
-rw-r--r--meta-oe/recipes-support/composefs/composefs_1.0.8.bb (renamed from meta-oe/recipes-support/composefs/composefs_1.0.4.bb)24
-rw-r--r--meta-oe/recipes-support/consolation/consolation_0.0.9.bb1
-rw-r--r--meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb3
-rw-r--r--meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb5
-rw-r--r--meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch51
-rw-r--r--meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb2
-rw-r--r--meta-oe/recipes-support/crucible/crucible-go-mods.inc155
-rw-r--r--meta-oe/recipes-support/crucible/crucible-licenses.inc40
-rw-r--r--meta-oe/recipes-support/crucible/crucible_2023.11.02.bb17
-rw-r--r--meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb3
-rw-r--r--meta-oe/recipes-support/ctre/ctre_3.9.0.bb21
-rw-r--r--meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb19
-rw-r--r--meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb1
-rw-r--r--meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch46
-rw-r--r--meta-oe/recipes-support/daemonize/daemonize_git.bb5
-rw-r--r--meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch252
-rw-r--r--meta-oe/recipes-support/daemontools/daemontools_0.76.bb12
-rw-r--r--meta-oe/recipes-support/dc/double-conversion_3.3.1.bb (renamed from meta-oe/recipes-support/dc/double-conversion_3.3.0.bb)3
-rw-r--r--meta-oe/recipes-support/devmem2/devmem2_2.0.bb4
-rw-r--r--meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch38
-rw-r--r--meta-oe/recipes-support/dhex/dhex_0.69.bb8
-rw-r--r--meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch32
-rw-r--r--meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb6
-rw-r--r--meta-oe/recipes-support/dool/dool_1.3.4.bb (renamed from meta-oe/recipes-support/dool/dool_1.3.2.bb)3
-rw-r--r--meta-oe/recipes-support/driverctl/driverctl_0.115.bb1
-rw-r--r--meta-oe/recipes-support/edid-decode/edid-decode_git.bb7
-rw-r--r--meta-oe/recipes-support/eject/eject_2.1.5.bb5
-rw-r--r--meta-oe/recipes-support/enca/enca/cross.patch68
-rw-r--r--meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch14
-rw-r--r--meta-oe/recipes-support/enca/enca_1.19.bb24
-rw-r--r--meta-oe/recipes-support/epeg/epeg_git.bb1
-rw-r--r--meta-oe/recipes-support/espeak/espeak_1.48.04.bb3
-rw-r--r--meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb1
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb19
-rw-r--r--meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb10
-rw-r--r--meta-oe/recipes-support/fbset/fbset-modes.bb3
-rw-r--r--meta-oe/recipes-support/fbset/fbset_2.1.bb1
-rw-r--r--meta-oe/recipes-support/fftw/fftw_3.3.10.bb2
-rw-r--r--meta-oe/recipes-support/fltk/fltk-native.bb2
-rw-r--r--meta-oe/recipes-support/fltk/fltk.bb2
-rw-r--r--meta-oe/recipes-support/fltk/fltk.inc4
-rw-r--r--meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch4
-rw-r--r--meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch42
-rw-r--r--meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb28
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch27
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb3
-rw-r--r--meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb14
-rw-r--r--meta-oe/recipes-support/function2/function2_4.2.4.bb1
-rw-r--r--meta-oe/recipes-support/fuse/fuse3_3.16.2.bb5
-rw-r--r--meta-oe/recipes-support/gd/gd_2.3.3.bb1
-rw-r--r--meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb1
-rw-r--r--meta-oe/recipes-support/genimage/genimage_18.bb22
-rw-r--r--meta-oe/recipes-support/gflags/gflags_2.2.2.bb3
-rw-r--r--meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch33
-rw-r--r--meta-oe/recipes-support/glog/glog/libexecinfo.patch40
-rw-r--r--meta-oe/recipes-support/glog/glog_0.7.1.bb (renamed from meta-oe/recipes-support/glog/glog_0.6.0.bb)8
-rw-r--r--meta-oe/recipes-support/gnulib/gnulib_202401.bb2
-rw-r--r--meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch33
-rw-r--r--meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch32
-rw-r--r--meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb (renamed from meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb)7
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch26
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch59
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch35
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch32
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch28
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch14
-rw-r--r--meta-oe/recipes-support/gperftools/gperftools_2.16.bb (renamed from meta-oe/recipes-support/gperftools/gperftools_2.15.bb)15
-rw-r--r--meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch234
-rw-r--r--meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch81
-rw-r--r--meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch37
-rw-r--r--meta-oe/recipes-support/gpm/gpm_git.bb8
-rw-r--r--meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb4
-rw-r--r--meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb2
-rw-r--r--meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb1
-rw-r--r--meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch41
-rw-r--r--meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb (renamed from meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb)14
-rw-r--r--meta-oe/recipes-support/hidapi/hidapi_0.15.0.bb (renamed from meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb)3
-rw-r--r--meta-oe/recipes-support/hstr/hstr_3.1.0.bb2
-rw-r--r--meta-oe/recipes-support/htop/htop_3.3.0.bb1
-rw-r--r--meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb6
-rw-r--r--meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb1
-rw-r--r--meta-oe/recipes-support/hwdata/hwdata_0.383.bb26
-rw-r--r--meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb1
-rw-r--r--meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch55
-rw-r--r--meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch62
-rw-r--r--meta-oe/recipes-support/iksemel/iksemel_1.5.bb24
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb183
-rw-r--r--meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb121
-rw-r--r--meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb (renamed from meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb)7
-rw-r--r--meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch45
-rw-r--r--meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb40
-rw-r--r--meta-oe/recipes-support/inih/libinih_58.bb1
-rw-r--r--meta-oe/recipes-support/iniparser/iniparser_4.2.6.bb (renamed from meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb)3
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch28
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch40
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch119
-rw-r--r--meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb (renamed from meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb)6
-rw-r--r--meta-oe/recipes-support/joe/joe_4.6.bb1
-rw-r--r--meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb14
-rw-r--r--meta-oe/recipes-support/lcms/lcms_2.16.bb2
-rwxr-xr-xmeta-oe/recipes-support/lcov/lcov_1.16.bb18
-rw-r--r--meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb29
-rw-r--r--meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb3
-rw-r--r--meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb1
-rw-r--r--meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb (renamed from meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb)3
-rw-r--r--meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch42
-rw-r--r--meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb2
-rw-r--r--meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch41
-rw-r--r--meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb2
-rw-r--r--meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch48
-rwxr-xr-xmeta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch42
-rw-r--r--meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb15
-rw-r--r--meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb1
-rw-r--r--meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch41
-rw-r--r--meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb2
-rw-r--r--meta-oe/recipes-support/libee/libee.inc39
-rwxr-xr-xmeta-oe/recipes-support/libee/libee/ezapi1.sh14
-rw-r--r--meta-oe/recipes-support/libee/libee/libee-parallel-make.patch20
-rwxr-xr-xmeta-oe/recipes-support/libee/libee/run-ptest3
-rw-r--r--meta-oe/recipes-support/libee/libee_0.4.1.bb4
-rw-r--r--meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch1040
-rw-r--r--meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb10
-rw-r--r--meta-oe/recipes-support/libestr/libestr_0.1.11.bb3
-rw-r--r--meta-oe/recipes-support/libfann/libfann_git.bb1
-rw-r--r--meta-oe/recipes-support/libfido2/libfido2_1.16.0.bb (renamed from meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb)4
-rw-r--r--meta-oe/recipes-support/libftdi/files/0001-CMake-bump-the-minimal-required-version-to-2.8.12.patch86
-rw-r--r--meta-oe/recipes-support/libftdi/files/0002-CMake-require-2.8.12-for-cmake_example.patch24
-rw-r--r--meta-oe/recipes-support/libftdi/files/0003-CMake-bump-the-minimal-required-version-to-3.5.patch34
-rw-r--r--meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch45
-rw-r--r--meta-oe/recipes-support/libftdi/libftdi_1.5.bb14
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch530
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init76
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest43
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod.inc1
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb6
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb33
-rw-r--r--meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb104
-rw-r--r--meta-oe/recipes-support/libgusb/libgusb_0.4.9.bb (renamed from meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb)12
-rw-r--r--meta-oe/recipes-support/libharu/libharu_2.4.5.bb (renamed from meta-oe/recipes-support/libharu/libharu_2.4.4.bb)3
-rw-r--r--meta-oe/recipes-support/libiio/libiio_0.26.bb (renamed from meta-oe/recipes-support/libiio/libiio_0.25.bb)5
-rw-r--r--meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb (renamed from meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb)13
-rw-r--r--meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb1
-rw-r--r--meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb1
-rw-r--r--meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb1
-rw-r--r--meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb6
-rw-r--r--meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb3
-rw-r--r--meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb11
-rw-r--r--meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb (renamed from meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb)2
-rw-r--r--meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb1
-rw-r--r--meta-oe/recipes-support/libmxml/libmxml_4.0.4.bb (renamed from meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb)3
-rw-r--r--meta-oe/recipes-support/libnice/libnice_0.1.22.bb3
-rw-r--r--meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch41
-rw-r--r--meta-oe/recipes-support/libnvme/libnvme_1.12.bb (renamed from meta-oe/recipes-support/libnvme/libnvme_1.9.bb)12
-rw-r--r--meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb1
-rw-r--r--meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch48
-rw-r--r--meta-oe/recipes-support/liboop/liboop/tcl_dev.patch13
-rw-r--r--meta-oe/recipes-support/liboop/liboop_1.0.1.bb7
-rw-r--r--meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch32
-rw-r--r--meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch86
-rw-r--r--meta-oe/recipes-support/libosinfo/libosinfo_1.12.0.bb (renamed from meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb)7
-rw-r--r--meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb20
-rw-r--r--meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb20
-rw-r--r--meta-oe/recipes-support/libp11/libp11_0.4.13.bb (renamed from meta-oe/recipes-support/libp11/libp11_0.4.12.bb)5
-rw-r--r--meta-oe/recipes-support/libpaper/libpaper_2.2.6.bb (renamed from meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb)5
-rw-r--r--meta-oe/recipes-support/libraw/libraw_0.21.2.bb4
-rw-r--r--meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb1
-rw-r--r--meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb1
-rw-r--r--meta-oe/recipes-support/librsync/librsync_2.3.4.bb1
-rw-r--r--meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb12
-rw-r--r--meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb18
-rw-r--r--meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch154
-rw-r--r--meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb5
-rw-r--r--meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb1
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch74
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch44
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch43
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch145
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch150
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch39
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch133
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch37
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch43
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch48
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch56
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch29
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch32
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch39
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch71
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch39
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch38
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch32
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch94
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch28
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch32
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch35
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch38
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch61
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch47
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch38
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch37
-rw-r--r--meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb86
-rw-r--r--meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch33
-rw-r--r--meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb83
-rw-r--r--meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch37
-rw-r--r--meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch44
-rw-r--r--meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch16
-rw-r--r--meta-oe/recipes-support/libssh/libssh_0.11.1.bb (renamed from meta-oe/recipes-support/libssh/libssh_0.10.6.bb)9
-rw-r--r--meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb1
-rw-r--r--meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch53
-rw-r--r--meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch44
-rw-r--r--meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch101
-rw-r--r--meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch26
-rw-r--r--meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch119
-rw-r--r--meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch89
-rw-r--r--meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch30
-rw-r--r--meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch26
-rw-r--r--meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch100
-rw-r--r--meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch160
-rw-r--r--meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch42
-rw-r--r--meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch52
-rw-r--r--meta-oe/recipes-support/libtar/libtar_1.2.20.bb15
-rw-r--r--meta-oe/recipes-support/libteam/libteam_1.32.bb1
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch27
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch31
-rw-r--r--meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb9
-rw-r--r--meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb (renamed from meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb)4
-rw-r--r--meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb1
-rw-r--r--meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch39
-rw-r--r--meta-oe/recipes-support/liburing/liburing_2.9.bb (renamed from meta-oe/recipes-support/liburing/liburing_2.6.bb)9
-rw-r--r--meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb1
-rw-r--r--meta-oe/recipes-support/libusbg/libusbg_git.bb1
-rw-r--r--meta-oe/recipes-support/libusbgx/libusbgx-config.bb3
-rwxr-xr-xmeta-oe/recipes-support/libusbgx/libusbgx/gadget-start6
-rw-r--r--meta-oe/recipes-support/libusbgx/libusbgx_git.bb5
-rw-r--r--meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb2
-rw-r--r--meta-oe/recipes-support/links/links-x11_2.26.bb2
-rw-r--r--meta-oe/recipes-support/links/links_2.29.bb2
-rw-r--r--meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch63
-rw-r--r--meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb75
-rw-r--r--meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb2
-rw-r--r--meta-oe/recipes-support/log4c/log4c_1.2.4.bb1
-rw-r--r--meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb8
-rw-r--r--meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb (renamed from meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb)6
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch33
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch12
-rw-r--r--meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch10
-rw-r--r--meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch6
-rw-r--r--meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch6
-rw-r--r--meta-oe/recipes-support/lvm2/libdevmapper.bb2
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.bb21
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2.inc33
-rw-r--r--meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch70
-rw-r--r--meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb3
-rw-r--r--meta-oe/recipes-support/mcelog/mce-inject_git.bb9
-rw-r--r--meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch2
-rw-r--r--meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch47
-rw-r--r--meta-oe/recipes-support/mcelog/mce-test_git.bb12
-rw-r--r--meta-oe/recipes-support/mcelog/mcelog_204.bb (renamed from meta-oe/recipes-support/mcelog/mcelog_199.bb)3
-rw-r--r--meta-oe/recipes-support/md4c/md4c_0.5.2.bb1
-rw-r--r--meta-oe/recipes-support/mg/mg_20230501.bb1
-rw-r--r--meta-oe/recipes-support/mime-support/mime-support_3.62.bb2
-rw-r--r--meta-oe/recipes-support/minini/minini_1.2.b.bb1
-rw-r--r--meta-oe/recipes-support/monit/monit_5.35.2.bb (renamed from meta-oe/recipes-support/monit/monit_5.34.0.bb)14
-rw-r--r--meta-oe/recipes-support/mscgen/mscgen_0.20.bb3
-rw-r--r--meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb3
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch28
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch42
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch10
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch19
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch11
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch12
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch6
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch (renamed from meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch)6
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch8
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch29
-rw-r--r--meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch41
-rw-r--r--[-rwxr-xr-x]meta-oe/recipes-support/multipath-tools/files/multipathd.oe0
-rw-r--r--meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb (renamed from meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb)15
-rw-r--r--meta-oe/recipes-support/nano/nano_8.3.bb (renamed from meta-oe/recipes-support/nano/nano_8.0.bb)4
-rw-r--r--meta-oe/recipes-support/ne10/ne10_1.2.1.bb2
-rw-r--r--meta-oe/recipes-support/neon/neon_0.33.0.bb17
-rw-r--r--meta-oe/recipes-support/nmon/nmon_16m.bb6
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch39
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch (renamed from meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch)25
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch (renamed from meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch)28
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch (renamed from meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch)17
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch (renamed from meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch)11
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch (renamed from meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch)20
-rw-r--r--meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch (renamed from meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch)2
-rw-r--r--meta-oe/recipes-support/nspr/nspr_4.36.bb (renamed from meta-oe/recipes-support/nspr/nspr_4.35.bb)17
-rw-r--r--meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch13
-rw-r--r--meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch (renamed from meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch)9
-rw-r--r--meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch (renamed from meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch)9
-rw-r--r--meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch (renamed from meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch)9
-rw-r--r--meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch (renamed from meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch)13
-rw-r--r--meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch (renamed from meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch)13
-rw-r--r--meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch (renamed from meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch)16
-rw-r--r--meta-oe/recipes-support/nss/nss_3.112.bb (renamed from meta-oe/recipes-support/nss/nss_3.101.bb)20
-rw-r--r--meta-oe/recipes-support/onig/onig_6.9.10.bb (renamed from meta-oe/recipes-support/onig/onig_6.9.9.bb)5
-rw-r--r--meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb1
-rw-r--r--meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch65
-rw-r--r--meta-oe/recipes-support/openct/openct_0.6.20.bb11
-rw-r--r--meta-oe/recipes-support/opencv/ade_0.1.2.bb1
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch50
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch87
-rw-r--r--meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch61
-rw-r--r--meta-oe/recipes-support/opencv/opencv_4.11.0.bb (renamed from meta-oe/recipes-support/opencv/opencv_4.9.0.bb)42
-rw-r--r--meta-oe/recipes-support/openldap/openldap_2.6.10.bb (renamed from meta-oe/recipes-support/openldap/openldap_2.6.7.bb)10
-rw-r--r--meta-oe/recipes-support/opensc/opensc_0.26.1.bb (renamed from meta-oe/recipes-support/opensc/opensc_0.25.1.bb)20
-rw-r--r--meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb3
-rw-r--r--meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb26
-rw-r--r--meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb30
-rw-r--r--meta-oe/recipes-support/p910nd/p910nd_0.97.bb1
-rw-r--r--meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb (renamed from meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb)3
-rw-r--r--meta-oe/recipes-support/pcp/pcp.inc8
-rw-r--r--meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch30
-rw-r--r--meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch11
-rw-r--r--meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch33
-rw-r--r--meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch116
-rw-r--r--meta-oe/recipes-support/pcp/pcp_6.3.7.bb (renamed from meta-oe/recipes-support/pcp/pcp_6.0.5.bb)45
-rw-r--r--meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb2
-rw-r--r--meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb (renamed from meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb)3
-rw-r--r--meta-oe/recipes-support/picocom/picocom_2024.bb (renamed from meta-oe/recipes-support/picocom/picocom_git.bb)8
-rw-r--r--meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb4
-rw-r--r--meta-oe/recipes-support/pidgin/icyque_git.bb4
-rw-r--r--meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb3
-rw-r--r--meta-oe/recipes-support/pidgin/libotr_4.1.1.bb1
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb1
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb5
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch26
-rw-r--r--meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb (renamed from meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb)22
-rw-r--r--meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb1
-rw-r--r--meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb (renamed from meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb)9
-rw-r--r--meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb4
-rw-r--r--meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch59
-rw-r--r--meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch60
-rw-r--r--meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch53
-rw-r--r--meta-oe/recipes-support/poco/poco_1.13.3.bb8
-rw-r--r--meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch40
-rw-r--r--meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch46
-rw-r--r--meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch41
-rw-r--r--meta-oe/recipes-support/poppler/poppler_25.04.0.bb (renamed from meta-oe/recipes-support/poppler/poppler_23.04.0.bb)17
-rw-r--r--meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb1
-rw-r--r--meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch59
-rw-r--r--meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb5
-rw-r--r--meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch88
-rw-r--r--meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch27
-rw-r--r--meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch29
-rw-r--r--meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch20
-rw-r--r--meta-oe/recipes-support/procmail/procmail/gcc14.patch127
-rw-r--r--meta-oe/recipes-support/procmail/procmail_3.22.bb12
-rw-r--r--meta-oe/recipes-support/psutils/psutils_2.10.bb2
-rw-r--r--meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch40
-rw-r--r--meta-oe/recipes-support/pv/pv/pv-test-system-version.patch18
-rw-r--r--meta-oe/recipes-support/pv/pv/run-ptest25
-rw-r--r--meta-oe/recipes-support/pv/pv_1.6.20.bb28
-rw-r--r--meta-oe/recipes-support/pv/pv_1.9.31.bb65
-rw-r--r--meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb4
-rw-r--r--meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch73
-rw-r--r--meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb6
-rw-r--r--meta-oe/recipes-support/re2/re2_2024.03.01.bb1
-rw-r--r--meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb1
-rw-r--r--meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb4
-rw-r--r--meta-oe/recipes-support/remmina/remmina_1.4.36.bb (renamed from meta-oe/recipes-support/remmina/remmina_1.4.35.bb)5
-rw-r--r--meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb3
-rw-r--r--meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb1
-rw-r--r--meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb1
-rw-r--r--meta-oe/recipes-support/rtkit/rtkit_0.13.bb1
-rw-r--r--meta-oe/recipes-support/sass/libsass_git.bb14
-rw-r--r--meta-oe/recipes-support/sass/sassc_git.bb14
-rw-r--r--meta-oe/recipes-support/satyr/satyr_0.43.bb1
-rw-r--r--meta-oe/recipes-support/sdmon/sdmon_git.bb1
-rw-r--r--meta-oe/recipes-support/sdparm/sdparm_1.12.bb3
-rw-r--r--meta-oe/recipes-support/serial-utils/pty-forward-native.bb2
-rw-r--r--meta-oe/recipes-support/serial-utils/serial-forward_git.bb2
-rw-r--r--meta-oe/recipes-support/serial/serial_1.2.1.bb1
-rw-r--r--meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb2
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch213
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch47
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch49
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch143
-rw-r--r--meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb9
-rw-r--r--meta-oe/recipes-support/smarty/smarty_4.4.1.bb28
-rw-r--r--meta-oe/recipes-support/smarty/smarty_5.4.5.bb37
-rw-r--r--meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch30
-rw-r--r--meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch37
-rw-r--r--meta-oe/recipes-support/snapper/snapper_0.11.2.bb40
-rw-r--r--meta-oe/recipes-support/source-highlight/source-highlight_git.bb35
-rw-r--r--meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb1
-rw-r--r--meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb (renamed from meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb)6
-rw-r--r--meta-oe/recipes-support/spitools/spitools_git.bb3
-rw-r--r--meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch36
-rw-r--r--meta-oe/recipes-support/srecord/srecord_1.65.0.bb6
-rw-r--r--meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb3
-rw-r--r--meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb1
-rw-r--r--meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch48
-rw-r--r--meta-oe/recipes-support/synergy/synergy_git.bb2
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch40
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd11
-rw-r--r--meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit8
-rw-r--r--meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.2.bb (renamed from meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb)16
-rw-r--r--meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb28
-rw-r--r--meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb27
-rw-r--r--meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch33
-rw-r--r--meta-oe/recipes-support/tbb/tbb_2022.1.0.bb (renamed from meta-oe/recipes-support/tbb/tbb_2021.11.0.bb)11
-rw-r--r--meta-oe/recipes-support/testdisk/testdisk_7.2.bb17
-rw-r--r--meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc214
-rw-r--r--meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc6
-rw-r--r--meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb50
-rw-r--r--meta-oe/recipes-support/tio/tio_3.9.bb (renamed from meta-oe/recipes-support/tio/tio_2.7.bb)14
-rw-r--r--meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb1
-rw-r--r--meta-oe/recipes-support/tree/tree_2.2.1.bb (renamed from meta-oe/recipes-support/tree/tree_2.1.1.bb)6
-rw-r--r--meta-oe/recipes-support/udisks/udisks2/CVE-2025-6019.patch51
-rw-r--r--meta-oe/recipes-support/udisks/udisks2_2.10.1.bb2
-rw-r--r--meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb (renamed from meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb)5
-rw-r--r--meta-oe/recipes-support/uim/uim_1.9.0.bb (renamed from meta-oe/recipes-support/uim/uim_1.8.9.bb)5
-rw-r--r--meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb9
-rw-r--r--meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb3
-rw-r--r--meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb28
-rw-r--r--meta-oe/recipes-support/upower/upower_1.90.6.bb (renamed from meta-oe/recipes-support/upower/upower_0.99.17.bb)21
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb1
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch51
-rw-r--r--meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb4
-rw-r--r--meta-oe/recipes-support/usbids/usbids_2025.04.01.bb (renamed from meta-oe/recipes-support/usbids/usbids_2023.01.16.bb)4
-rw-r--r--meta-oe/recipes-support/uthash/uthash_2.3.0.bb1
-rw-r--r--meta-oe/recipes-support/utouch/utouch-evemu_git.bb1
-rw-r--r--meta-oe/recipes-support/utouch/utouch-frame_git.bb1
-rw-r--r--meta-oe/recipes-support/utouch/utouch-mtview_git.bb1
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch28
-rw-r--r--meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.1.8.bb (renamed from meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb)20
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch30
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch35
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch65
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch39
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch18
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch24
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch16
-rw-r--r--meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb (renamed from meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb)31
-rw-r--r--meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb5
-rw-r--r--meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb2
-rw-r--r--meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb (renamed from meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb)3
-rw-r--r--meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.0.bb (renamed from meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb)6
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch18
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch7
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch8
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch6
-rw-r--r--meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb (renamed from meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb)11
-rw-r--r--meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch37
-rw-r--r--meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb5
-rw-r--r--meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb9
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch7
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch12
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch9
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch9
-rw-r--r--meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb (renamed from meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb)5
-rw-r--r--meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb41
-rw-r--r--meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb4
-rw-r--r--meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb33
-rw-r--r--meta-oe/recipes-support/zbar/zbar_git.bb1
-rw-r--r--meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb (renamed from meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb)3
-rw-r--r--meta-oe/recipes-support/zile/zile_2.4.15.bb1
501 files changed, 11585 insertions, 3712 deletions
diff --git a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
index 6d64ab71bf..85443984a2 100644
--- a/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
+++ b/meta-oe/recipes-support/ace-cloud-editor/ace-cloud-editor_git.bb
@@ -11,7 +11,6 @@ SRCREV = "812e2c56aed246931a667f16c28b096e34597016"
11 11
12FILES:${PN} = "${datadir}/ace-builds" 12FILES:${PN} = "${datadir}/ace-builds"
13 13
14S = "${WORKDIR}/git"
15 14
16DEPENDS += "rsync-native" 15DEPENDS += "rsync-native"
17 16
diff --git a/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-oe/recipes-support/anthy/anthy_9100h.bb
index f2bf52cdbc..1826e91697 100644
--- a/meta-oe/recipes-support/anthy/anthy_9100h.bb
+++ b/meta-oe/recipes-support/anthy/anthy_9100h.bb
@@ -1,4 +1,4 @@
1DESCRIPTION="Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text." 1DESCRIPTION = "Anthy is a system for Japanese input method. It converts Hiragana text to Kana Kanji mixed text."
2HOMEPAGE = "http://anthy.sourceforge.jp" 2HOMEPAGE = "http://anthy.sourceforge.jp"
3 3
4LICENSE = "LGPL-2.1-only & GPL-2.0-only" 4LICENSE = "LGPL-2.1-only & GPL-2.0-only"
@@ -14,9 +14,11 @@ SRC_URI = "http://osdn.dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz \
14SRC_URI:append:class-target = " file://target-helpers.patch" 14SRC_URI:append:class-target = " file://target-helpers.patch"
15SRC_URI:append:class-native = " file://native-helpers.patch" 15SRC_URI:append:class-native = " file://native-helpers.patch"
16 16
17SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108"
18SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" 17SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547"
19 18
19UPSTREAM_CHECK_URI = "https://osdn.net/projects/anthy/releases/"
20UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>(\d+)+(\w*))"
21
20DEPENDS:class-target = "anthy-native" 22DEPENDS:class-target = "anthy-native"
21RDEPENDS:${PN}:class-target = "libanthy0" 23RDEPENDS:${PN}:class-target = "libanthy0"
22 24
diff --git a/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
new file mode 100644
index 0000000000..5aa502916d
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/0001-tests-Remove-blocking_adaptation.cpp.patch
@@ -0,0 +1,37 @@
1From 7d76513b82a67e117d195a1b5a0d6c2e8591488b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Thu, 10 Oct 2024 13:58:38 +0800
4Subject: [PATCH] tests: Remove blocking_adaptation.cpp
5
6The test failed to build with clang as below.
7../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:216:13: error: call to 'query' is ambiguous
8 216 | conditional_t<true, T, P>::query(static_cast<P&&>(p))
9 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
10../../../asio-1.30.2/src/tests/../../include/asio/execution/blocking_adaptation.hpp:213:29: note: in instantiation of exception specification for 'query<asio::execution::detail::blocking_adaptation::allowed_t<>>' requested here
11 213 | static constexpr auto query(P&& p)
12 |
13
14We can add the case back once the above build failure resolved then.
15
16Upstream-Status: Pending
17
18Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
19---
20 src/tests/Makefile.am | 1 -
21 1 file changed, 1 deletion(-)
22
23diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
24index 04f8a03..eab2d56 100644
25--- a/src/tests/Makefile.am
26+++ b/src/tests/Makefile.am
27@@ -68,7 +68,6 @@ check_PROGRAMS = \
28 unit/error \
29 unit/execution/any_executor \
30 unit/execution/blocking \
31- unit/execution/blocking_adaptation \
32 unit/execution/context_as \
33 unit/execution/executor \
34 unit/execution/invocable_archetype \
35--
362.34.1
37
diff --git a/meta-oe/recipes-support/asio/asio/run-ptest b/meta-oe/recipes-support/asio/asio/run-ptest
new file mode 100644
index 0000000000..d37db0b315
--- /dev/null
+++ b/meta-oe/recipes-support/asio/asio/run-ptest
@@ -0,0 +1,19 @@
1#!/bin/sh
2
3ptestdir=$(dirname "$(readlink -f "$0")")
4cd "$ptestdir"/tests || exit
5
6tests=$(find * -type f -executable)
7
8rm -rf test.log
9
10for f in $tests
11do
12 if test -x ./"$f"; then
13 if ./"$f" > test.log 2>&1; then
14 echo "PASS: $f"
15 else
16 echo "FAIL: $f"
17 fi
18 fi
19done
diff --git a/meta-oe/recipes-support/asio/asio_1.30.2.bb b/meta-oe/recipes-support/asio/asio_1.30.2.bb
index 6930381ecd..1f492b71eb 100644
--- a/meta-oe/recipes-support/asio/asio_1.30.2.bb
+++ b/meta-oe/recipes-support/asio/asio_1.30.2.bb
@@ -8,9 +8,12 @@ LICENSE = "BSL-1.0"
8 8
9DEPENDS = "openssl" 9DEPENDS = "openssl"
10 10
11SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2" 11SRC_URI = "${SOURCEFORGE_MIRROR}/asio/${BP}.tar.bz2 \
12 file://0001-tests-Remove-blocking_adaptation.cpp.patch \
13 file://run-ptest \
14"
12 15
13inherit autotools 16inherit autotools ptest
14 17
15ALLOW_EMPTY:${PN} = "1" 18ALLOW_EMPTY:${PN} = "1"
16 19
@@ -22,4 +25,16 @@ PACKAGECONFIG ??= "boost"
22 25
23PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost" 26PACKAGECONFIG[boost] = "--with-boost=${STAGING_LIBDIR},--without-boost,boost"
24 27
28TESTDIR = "src/tests"
29do_compile_ptest() {
30 echo 'buildtest-TESTS: $(check_PROGRAMS)' >> ${TESTDIR}/Makefile
31 oe_runmake -C ${TESTDIR} buildtest-TESTS
32}
33
34do_install_ptest() {
35 install -d ${D}${PTEST_PATH}/tests
36 # copy executables
37 find ${B}/${TESTDIR}/unit -type f -executable -exec cp {} ${D}${PTEST_PATH}/tests/ \;
38}
39
25BBCLASSEXTEND = "native nativesdk" 40BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
new file mode 100644
index 0000000000..f55ad5318a
--- /dev/null
+++ b/meta-oe/recipes-support/atop/atop/0001-Redefine-function-prototypes-solves-issue-322.patch
@@ -0,0 +1,1154 @@
1From ece93ebc7b9ebbb73f92b2238a87b78ddbd4ca98 Mon Sep 17 00:00:00 2001
2From: Gerlof Langeveld <gerlof.langeveld@atoptool.nl>
3Date: Fri, 14 Mar 2025 15:39:30 +0100
4Subject: [PATCH] Redefine function prototypes (solves issue #322)
5
6Certain function prototypes did not explicitly define the
7calling argument types, specifically the prototypes for the
8convert functions defined in the 'detail_printdef' structure.
9These incomplete definitions cause a lot of errors when using
10gcc 1.15 which is based on C23.
11
12Upstream-Status: Backport [ece93eb Redefine function prototypes (solves issue #322)]
13---
14 atop.c | 5 ++
15 atopacctd.c | 5 ++
16 atopcat.c | 6 ++
17 atopconvert.c | 1 +
18 atophide.c | 5 ++
19 atopsar.c | 4 ++
20 cgroups.c | 7 +-
21 drawbar.c | 4 ++
22 gpucom.c | 4 ++
23 netatopif.c | 4 ++
24 photoproc.c | 4 ++
25 photosyst.c | 5 ++
26 rawlog.c | 4 ++
27 showgeneric.c | 4 ++
28 showlinux.h | 11 ++-
29 showprocs.c | 188 +++++++++++++++++++++++++-------------------------
30 various.c | 4 ++
31 17 files changed, 168 insertions(+), 97 deletions(-)
32
33diff --git a/atop.c b/atop.c
34index fe037fc..ac6aa6d 100644
35--- a/atop.c
36+++ b/atop.c
37@@ -118,6 +118,10 @@
38 ** can be linked with 'atop'; the one to use can eventually be chosen
39 ** at runtime.
40 */
41+#define _POSIX_C_SOURCE
42+#define _XOPEN_SOURCE
43+#define _GNU_SOURCE
44+#define _DEFAULT_SOURCE
45
46 #include <sys/types.h>
47 #include <sys/param.h>
48@@ -128,6 +132,7 @@
49 #include <errno.h>
50 #include <fcntl.h>
51 #include <unistd.h>
52+#include <getopt.h>
53 #include <stdlib.h>
54 #include <signal.h>
55 #include <sys/utsname.h>
56diff --git a/atopacctd.c b/atopacctd.c
57index b16d6a6..c8816b6 100644
58--- a/atopacctd.c
59+++ b/atopacctd.c
60@@ -36,6 +36,11 @@
61 ** it under the terms of the GNU General Public License version 2 as
62 ** published by the Free Software Foundation.
63 */
64+#define _POSIX_C_SOURCE
65+#define _XOPEN_SOURCE
66+#define _GNU_SOURCE
67+#define _DEFAULT_SOURCE
68+
69 #include <sys/types.h>
70 #include <sys/stat.h>
71 #include <stdio.h>
72diff --git a/atopcat.c b/atopcat.c
73index fb014a0..099a888 100644
74--- a/atopcat.c
75+++ b/atopcat.c
76@@ -28,9 +28,15 @@
77 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
78 ** --------------------------------------------------------------------------
79 */
80+#define _POSIX_C_SOURCE
81+#define _XOPEN_SOURCE
82+#define _GNU_SOURCE
83+#define _DEFAULT_SOURCE
84+
85 #include <sys/types.h>
86 #include <sys/param.h>
87 #include <sys/stat.h>
88+#include <getopt.h>
89 #include <fcntl.h>
90 #include <time.h>
91 #include <stdio.h>
92diff --git a/atopconvert.c b/atopconvert.c
93index fd34a85..9c083a6 100644
94--- a/atopconvert.c
95+++ b/atopconvert.c
96@@ -32,6 +32,7 @@
97 #include <sys/param.h>
98 #include <sys/mman.h>
99 #include <sys/stat.h>
100+#include <getopt.h>
101 #include <time.h>
102 #include <stdio.h>
103 #include <errno.h>
104diff --git a/atophide.c b/atophide.c
105index 0502262..313929e 100644
106--- a/atophide.c
107+++ b/atophide.c
108@@ -31,6 +31,11 @@
109 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
110 ** --------------------------------------------------------------------------
111 */
112+#define _POSIX_C_SOURCE
113+#define _XOPEN_SOURCE
114+#define _GNU_SOURCE
115+#define _DEFAULT_SOURCE
116+
117 #include <sys/types.h>
118 #include <sys/param.h>
119 #include <sys/mman.h>
120diff --git a/atopsar.c b/atopsar.c
121index a3dd121..1cf13e8 100644
122--- a/atopsar.c
123+++ b/atopsar.c
124@@ -28,6 +28,10 @@
125 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
126 ** --------------------------------------------------------------------------
127 */
128+#define _POSIX_C_SOURCE
129+#define _XOPEN_SOURCE
130+#define _GNU_SOURCE
131+#define _DEFAULT_SOURCE
132
133 #include <sys/types.h>
134 #include <sys/param.h>
135diff --git a/cgroups.c b/cgroups.c
136index d617b48..4f1247c 100644
137--- a/cgroups.c
138+++ b/cgroups.c
139@@ -27,6 +27,10 @@
140 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
141 ** --------------------------------------------------------------------------
142 */
143+#define _POSIX_C_SOURCE
144+#define _XOPEN_SOURCE
145+#define _GNU_SOURCE
146+#define _DEFAULT_SOURCE
147
148 #include <sys/types.h>
149 #include <sys/param.h>
150@@ -1189,7 +1193,8 @@ mergecgrouplist(struct cglinesel **cgroupselp, int newdepth,
151 //
152 cgroupsel = malloc(sizeof(struct cglinesel) * (ncgroups+nprocs));
153
154- ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
155+ if (cgroupsel == NULL)
156+ ptrverify(cgroupsel, "Malloc for cglinesel structs failed (%d)\n",
157 ncgroups + nprocs);
158
159 *cgroupselp = cgroupsel;
160diff --git a/drawbar.c b/drawbar.c
161index 0ab3b40..c8539bf 100644
162--- a/drawbar.c
163+++ b/drawbar.c
164@@ -103,6 +103,10 @@
165 // horizontally scaled by the user, atop might switch from one model to
166 // the other.
167 /////////////////////////////////////////////////////////////////////////////
168+#define _POSIX_C_SOURCE
169+#define _XOPEN_SOURCE
170+#define _GNU_SOURCE
171+#define _DEFAULT_SOURCE
172
173 #include <sys/types.h>
174 #include <curses.h>
175diff --git a/gpucom.c b/gpucom.c
176index 1ff3818..25e7637 100644
177--- a/gpucom.c
178+++ b/gpucom.c
179@@ -22,6 +22,10 @@
180 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
181 ** See the GNU General Public License for more details.
182 */
183+#define _POSIX_C_SOURCE
184+#define _XOPEN_SOURCE
185+#define _GNU_SOURCE
186+#define _DEFAULT_SOURCE
187
188 #include <sys/types.h>
189 #include <sys/socket.h>
190diff --git a/netatopif.c b/netatopif.c
191index ea67142..d0e9c29 100644
192--- a/netatopif.c
193+++ b/netatopif.c
194@@ -22,6 +22,10 @@
195 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
196 ** See the GNU General Public License for more details.
197 */
198+#define _POSIX_C_SOURCE
199+#define _XOPEN_SOURCE
200+#define _GNU_SOURCE
201+#define _DEFAULT_SOURCE
202
203 #include <sys/types.h>
204 #include <stdio.h>
205diff --git a/photoproc.c b/photoproc.c
206index 234007b..2b8de20 100644
207--- a/photoproc.c
208+++ b/photoproc.c
209@@ -30,6 +30,10 @@
210 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
211 ** --------------------------------------------------------------------------
212 */
213+#define _POSIX_C_SOURCE
214+#define _XOPEN_SOURCE
215+#define _GNU_SOURCE
216+#define _DEFAULT_SOURCE
217
218 #include <sys/types.h>
219 #include <sys/param.h>
220diff --git a/photosyst.c b/photosyst.c
221index 46fccd8..9012946 100644
222--- a/photosyst.c
223+++ b/photosyst.c
224@@ -29,6 +29,11 @@
225 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
226 ** --------------------------------------------------------------------------
227 */
228+#define _POSIX_C_SOURCE
229+#define _XOPEN_SOURCE
230+#define _GNU_SOURCE
231+#define _DEFAULT_SOURCE
232+
233 #include <sys/types.h>
234 #include <stdio.h>
235 #include <string.h>
236diff --git a/rawlog.c b/rawlog.c
237index f46430d..541b75c 100644
238--- a/rawlog.c
239+++ b/rawlog.c
240@@ -26,6 +26,10 @@
241 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
242 ** --------------------------------------------------------------------------
243 */
244+#define _POSIX_C_SOURCE
245+#define _XOPEN_SOURCE
246+#define _GNU_SOURCE
247+#define _DEFAULT_SOURCE
248
249 #include <sys/types.h>
250 #include <sys/param.h>
251diff --git a/showgeneric.c b/showgeneric.c
252index 0722a64..a472501 100644
253--- a/showgeneric.c
254+++ b/showgeneric.c
255@@ -29,6 +29,10 @@
256 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
257 ** --------------------------------------------------------------------------
258 */
259+#define _POSIX_C_SOURCE
260+#define _XOPEN_SOURCE
261+#define _GNU_SOURCE
262+#define _DEFAULT_SOURCE
263
264 #include <sys/types.h>
265 #include <sys/param.h>
266diff --git a/showlinux.h b/showlinux.h
267index e082c72..72c57b9 100644
268--- a/showlinux.h
269+++ b/showlinux.h
270@@ -102,9 +102,16 @@ typedef struct
271 {
272 char *head; // column header
273 char *configname; // name as used to config print line
274- char *(*doactiveconvert)(); // pointer to conv function
275+
276+ union {
277+ char *(*doactiveconverts)(struct tstat *, int, int);
278+ char *(*doactiveconvertc)(struct cgchainer *, struct tstat *,
279+ int, int, count_t, int, int *);
280+ } ac;
281+ // pointer to conv function
282 // for active process
283- char *(*doexitconvert)(); // pointer to conv function
284+ char *(*doexitconvert)(struct tstat *, int, int);
285+ // pointer to conv function
286 // for exited process
287 char sortcrit; // sort criterion similar to showorder
288 int width; // required width
289diff --git a/showprocs.c b/showprocs.c
290index 0db1e31..020cc85 100644
291--- a/showprocs.c
292+++ b/showprocs.c
293@@ -510,7 +510,7 @@ showprocline(detail_printpair* elemptr, struct tstat *curstat,
294 }
295 else if (curstat->gen.state != 'E') // active process
296 {
297- printg("%s", curelem.pf->doactiveconvert(curstat,
298+ printg("%s", curelem.pf->ac.doactiveconverts(curstat,
299 avgval, nsecs));
300 }
301 else // exited process
302@@ -622,7 +622,7 @@ procprt_TID_ae(struct tstat *curstat, int avgval, int nsecs)
303 }
304
305 detail_printdef procprt_TID =
306- { "TID", "TID", procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
307+ { "TID", "TID", .ac.doactiveconverts = procprt_TID_ae, procprt_TID_ae, ' ', 5}; //DYNAMIC WIDTH!
308 /***************************************************************/
309 char *
310 procprt_PID_a(struct tstat *curstat, int avgval, int nsecs)
311@@ -646,7 +646,7 @@ procprt_PID_e(struct tstat *curstat, int avgval, int nsecs)
312 }
313
314 detail_printdef procprt_PID =
315- { "PID", "PID", procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
316+ { "PID", "PID", .ac.doactiveconverts = procprt_PID_a, procprt_PID_e, ' ', 5}; //DYNAMIC WIDTH!
317 /***************************************************************/
318 char *
319 procprt_PPID_a(struct tstat *curstat, int avgval, int nsecs)
320@@ -670,7 +670,7 @@ procprt_PPID_e(struct tstat *curstat, int avgval, int nsecs)
321 }
322
323 detail_printdef procprt_PPID =
324- { "PPID", "PPID", procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
325+ { "PPID", "PPID", .ac.doactiveconverts = procprt_PPID_a, procprt_PPID_e, ' ', 5}; //DYNAMIC WIDTH!
326 /***************************************************************/
327 char *
328 procprt_VPID_a(struct tstat *curstat, int avgval, int nsecs)
329@@ -691,7 +691,7 @@ procprt_VPID_e(struct tstat *curstat, int avgval, int nsecs)
330 }
331
332 detail_printdef procprt_VPID =
333- { "VPID", "VPID", procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
334+ { "VPID", "VPID", .ac.doactiveconverts = procprt_VPID_a, procprt_VPID_e, ' ', 5}; //DYNAMIC WIDTH!
335 /***************************************************************/
336 char *
337 procprt_CTID_a(struct tstat *curstat, int avgval, int nsecs)
338@@ -709,7 +709,7 @@ procprt_CTID_e(struct tstat *curstat, int avgval, int nsecs)
339 }
340
341 detail_printdef procprt_CTID =
342- { " CTID", "CTID", procprt_CTID_a, procprt_CTID_e, ' ', 5};
343+ { " CTID", "CTID", .ac.doactiveconverts = procprt_CTID_a, procprt_CTID_e, ' ', 5};
344 /***************************************************************/
345 char *
346 procprt_CID_a(struct tstat *curstat, int avgval, int nsecs)
347@@ -738,7 +738,7 @@ procprt_CID_e(struct tstat *curstat, int avgval, int nsecs)
348 }
349
350 detail_printdef procprt_CID =
351- { "CID/POD ", "CID", procprt_CID_a, procprt_CID_e, ' ', 15};
352+ { "CID/POD ", "CID", .ac.doactiveconverts = procprt_CID_a, procprt_CID_e, ' ', 15};
353 /***************************************************************/
354 char *
355 procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
356@@ -750,7 +750,7 @@ procprt_SYSCPU_ae(struct tstat *curstat, int avgval, int nsecs)
357 }
358
359 detail_printdef procprt_SYSCPU =
360- { "SYSCPU", "SYSCPU", procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
361+ { "SYSCPU", "SYSCPU", .ac.doactiveconverts = procprt_SYSCPU_ae, procprt_SYSCPU_ae, ' ', 6};
362 /***************************************************************/
363 char *
364 procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
365@@ -762,7 +762,7 @@ procprt_USRCPU_ae(struct tstat *curstat, int avgval, int nsecs)
366 }
367
368 detail_printdef procprt_USRCPU =
369- { "USRCPU", "USRCPU", procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
370+ { "USRCPU", "USRCPU", .ac.doactiveconverts = procprt_USRCPU_ae, procprt_USRCPU_ae, ' ', 6};
371 /***************************************************************/
372 char *
373 procprt_VGROW_a(struct tstat *curstat, int avgval, int nsecs)
374@@ -780,7 +780,7 @@ procprt_VGROW_e(struct tstat *curstat, int avgval, int nsecs)
375 }
376
377 detail_printdef procprt_VGROW =
378- { " VGROW", "VGROW", procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
379+ { " VGROW", "VGROW", .ac.doactiveconverts = procprt_VGROW_a, procprt_VGROW_e, ' ', 6};
380 /***************************************************************/
381 char *
382 procprt_RGROW_a(struct tstat *curstat, int avgval, int nsecs)
383@@ -798,7 +798,7 @@ procprt_RGROW_e(struct tstat *curstat, int avgval, int nsecs)
384 }
385
386 detail_printdef procprt_RGROW =
387- { " RGROW", "RGROW", procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
388+ { " RGROW", "RGROW", .ac.doactiveconverts = procprt_RGROW_a, procprt_RGROW_e, ' ', 6};
389 /***************************************************************/
390 char *
391 procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
392@@ -810,7 +810,7 @@ procprt_MINFLT_ae(struct tstat *curstat, int avgval, int nsecs)
393 }
394
395 detail_printdef procprt_MINFLT =
396- { "MINFLT", "MINFLT", procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
397+ { "MINFLT", "MINFLT", .ac.doactiveconverts = procprt_MINFLT_ae, procprt_MINFLT_ae, ' ', 6};
398 /***************************************************************/
399 char *
400 procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
401@@ -822,7 +822,7 @@ procprt_MAJFLT_ae(struct tstat *curstat, int avgval, int nsecs)
402 }
403
404 detail_printdef procprt_MAJFLT =
405- { "MAJFLT", "MAJFLT", procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
406+ { "MAJFLT", "MAJFLT", .ac.doactiveconverts = procprt_MAJFLT_ae, procprt_MAJFLT_ae, ' ', 6};
407 /***************************************************************/
408 char *
409 procprt_VSTEXT_a(struct tstat *curstat, int avgval, int nsecs)
410@@ -840,7 +840,7 @@ procprt_VSTEXT_e(struct tstat *curstat, int avgval, int nsecs)
411 }
412
413 detail_printdef procprt_VSTEXT =
414- { "VSTEXT", "VSTEXT", procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
415+ { "VSTEXT", "VSTEXT", .ac.doactiveconverts = procprt_VSTEXT_a, procprt_VSTEXT_e, ' ', 6};
416 /***************************************************************/
417 char *
418 procprt_VSIZE_a(struct tstat *curstat, int avgval, int nsecs)
419@@ -858,7 +858,7 @@ procprt_VSIZE_e(struct tstat *curstat, int avgval, int nsecs)
420 }
421
422 detail_printdef procprt_VSIZE =
423- { " VSIZE", "VSIZE", procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
424+ { " VSIZE", "VSIZE", .ac.doactiveconverts = procprt_VSIZE_a, procprt_VSIZE_e, ' ', 6};
425 /***************************************************************/
426 char *
427 procprt_RSIZE_a(struct tstat *curstat, int avgval, int nsecs)
428@@ -876,7 +876,7 @@ procprt_RSIZE_e(struct tstat *curstat, int avgval, int nsecs)
429 }
430
431 detail_printdef procprt_RSIZE =
432- { " RSIZE", "RSIZE", procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
433+ { " RSIZE", "RSIZE", .ac.doactiveconverts = procprt_RSIZE_a, procprt_RSIZE_e, ' ', 6};
434 /***************************************************************/
435 char *
436 procprt_PSIZE_a(struct tstat *curstat, int avgval, int nsecs)
437@@ -897,7 +897,7 @@ procprt_PSIZE_e(struct tstat *curstat, int avgval, int nsecs)
438 }
439
440 detail_printdef procprt_PSIZE =
441- { " PSIZE", "PSIZE", procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
442+ { " PSIZE", "PSIZE", .ac.doactiveconverts = procprt_PSIZE_a, procprt_PSIZE_e, ' ', 6};
443 /***************************************************************/
444 char *
445 procprt_VSLIBS_a(struct tstat *curstat, int avgval, int nsecs)
446@@ -915,7 +915,7 @@ procprt_VSLIBS_e(struct tstat *curstat, int avgval, int nsecs)
447 }
448
449 detail_printdef procprt_VSLIBS =
450- { "VSLIBS", "VSLIBS", procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
451+ { "VSLIBS", "VSLIBS", .ac.doactiveconverts = procprt_VSLIBS_a, procprt_VSLIBS_e, ' ', 6};
452 /***************************************************************/
453 char *
454 procprt_VDATA_a(struct tstat *curstat, int avgval, int nsecs)
455@@ -933,7 +933,7 @@ procprt_VDATA_e(struct tstat *curstat, int avgval, int nsecs)
456 }
457
458 detail_printdef procprt_VDATA =
459- { " VDATA", "VDATA", procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
460+ { " VDATA", "VDATA", .ac.doactiveconverts = procprt_VDATA_a, procprt_VDATA_e, ' ', 6};
461 /***************************************************************/
462 char *
463 procprt_VSTACK_a(struct tstat *curstat, int avgval, int nsecs)
464@@ -951,7 +951,7 @@ procprt_VSTACK_e(struct tstat *curstat, int avgval, int nsecs)
465 }
466
467 detail_printdef procprt_VSTACK =
468- { "VSTACK", "VSTACK", procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
469+ { "VSTACK", "VSTACK", .ac.doactiveconverts = procprt_VSTACK_a, procprt_VSTACK_e, ' ', 6};
470 /***************************************************************/
471 char *
472 procprt_SWAPSZ_a(struct tstat *curstat, int avgval, int nsecs)
473@@ -969,7 +969,7 @@ procprt_SWAPSZ_e(struct tstat *curstat, int avgval, int nsecs)
474 }
475
476 detail_printdef procprt_SWAPSZ =
477- { "SWAPSZ", "SWAPSZ", procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
478+ { "SWAPSZ", "SWAPSZ", .ac.doactiveconverts = procprt_SWAPSZ_a, procprt_SWAPSZ_e, ' ', 6};
479 /***************************************************************/
480 char *
481 procprt_LOCKSZ_a(struct tstat *curstat, int avgval, int nsecs)
482@@ -987,7 +987,7 @@ procprt_LOCKSZ_e(struct tstat *curstat, int avgval, int nsecs)
483 }
484
485 detail_printdef procprt_LOCKSZ =
486- { "LOCKSZ", "LOCKSZ", procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
487+ { "LOCKSZ", "LOCKSZ", .ac.doactiveconverts = procprt_LOCKSZ_a, procprt_LOCKSZ_e, ' ', 6};
488 /***************************************************************/
489 char *
490 procprt_CMD_a(struct tstat *curstat, int avgval, int nsecs)
491@@ -1010,7 +1010,7 @@ procprt_CMD_e(struct tstat *curstat, int avgval, int nsecs)
492 }
493
494 detail_printdef procprt_CMD =
495- { "CMD ", "CMD", procprt_CMD_a, procprt_CMD_e, ' ', 14};
496+ { "CMD ", "CMD", .ac.doactiveconverts = procprt_CMD_a, procprt_CMD_e, ' ', 14};
497 /***************************************************************/
498 char *
499 procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
500@@ -1023,7 +1023,7 @@ procprt_RUID_ae(struct tstat *curstat, int avgval, int nsecs)
501 }
502
503 detail_printdef procprt_RUID =
504- { "RUID ", "RUID", procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
505+ { "RUID ", "RUID", .ac.doactiveconverts = procprt_RUID_ae, procprt_RUID_ae, ' ', 8};
506 /***************************************************************/
507 char *
508 procprt_EUID_a(struct tstat *curstat, int avgval, int nsecs)
509@@ -1042,7 +1042,7 @@ procprt_EUID_e(struct tstat *curstat, int avgval, int nsecs)
510 }
511
512 detail_printdef procprt_EUID =
513- { "EUID ", "EUID", procprt_EUID_a, procprt_EUID_e, ' ', 8};
514+ { "EUID ", "EUID", .ac.doactiveconverts = procprt_EUID_a, procprt_EUID_e, ' ', 8};
515 /***************************************************************/
516 char *
517 procprt_SUID_a(struct tstat *curstat, int avgval, int nsecs)
518@@ -1061,7 +1061,7 @@ procprt_SUID_e(struct tstat *curstat, int avgval, int nsecs)
519 }
520
521 detail_printdef procprt_SUID =
522- { "SUID ", "SUID", procprt_SUID_a, procprt_SUID_e, ' ', 8};
523+ { "SUID ", "SUID", .ac.doactiveconverts = procprt_SUID_a, procprt_SUID_e, ' ', 8};
524 /***************************************************************/
525 char *
526 procprt_FSUID_a(struct tstat *curstat, int avgval, int nsecs)
527@@ -1080,7 +1080,7 @@ procprt_FSUID_e(struct tstat *curstat, int avgval, int nsecs)
528 }
529
530 detail_printdef procprt_FSUID =
531- { "FSUID ", "FSUID", procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
532+ { "FSUID ", "FSUID", .ac.doactiveconverts = procprt_FSUID_a, procprt_FSUID_e, ' ', 8};
533 /***************************************************************/
534 char *
535 procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
536@@ -1093,7 +1093,7 @@ procprt_RGID_ae(struct tstat *curstat, int avgval, int nsecs)
537 }
538
539 detail_printdef procprt_RGID =
540- { "RGID ", "RGID", procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
541+ { "RGID ", "RGID", .ac.doactiveconverts = procprt_RGID_ae, procprt_RGID_ae, ' ', 8};
542 /***************************************************************/
543 char *
544 procprt_EGID_a(struct tstat *curstat, int avgval, int nsecs)
545@@ -1112,7 +1112,7 @@ procprt_EGID_e(struct tstat *curstat, int avgval, int nsecs)
546 }
547
548 detail_printdef procprt_EGID =
549- { "EGID ", "EGID", procprt_EGID_a, procprt_EGID_e, ' ', 8};
550+ { "EGID ", "EGID", .ac.doactiveconverts = procprt_EGID_a, procprt_EGID_e, ' ', 8};
551 /***************************************************************/
552 char *
553 procprt_SGID_a(struct tstat *curstat, int avgval, int nsecs)
554@@ -1131,7 +1131,7 @@ procprt_SGID_e(struct tstat *curstat, int avgval, int nsecs)
555 }
556
557 detail_printdef procprt_SGID =
558- { "SGID ", "SGID", procprt_SGID_a, procprt_SGID_e, ' ', 8};
559+ { "SGID ", "SGID", .ac.doactiveconverts = procprt_SGID_a, procprt_SGID_e, ' ', 8};
560 /***************************************************************/
561 char *
562 procprt_FSGID_a(struct tstat *curstat, int avgval, int nsecs)
563@@ -1150,7 +1150,7 @@ procprt_FSGID_e(struct tstat *curstat, int avgval, int nsecs)
564 }
565
566 detail_printdef procprt_FSGID =
567- { "FSGID ", "FSGID", procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
568+ { "FSGID ", "FSGID", .ac.doactiveconverts = procprt_FSGID_a, procprt_FSGID_e, ' ', 8};
569 /***************************************************************/
570 char *
571 procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
572@@ -1162,7 +1162,7 @@ procprt_STDATE_ae(struct tstat *curstat, int avgval, int nsecs)
573 }
574
575 detail_printdef procprt_STDATE =
576- { " STDATE ", "STDATE", procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
577+ { " STDATE ", "STDATE", .ac.doactiveconverts = procprt_STDATE_ae, procprt_STDATE_ae, ' ', 10};
578 /***************************************************************/
579 char *
580 procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
581@@ -1174,7 +1174,7 @@ procprt_STTIME_ae(struct tstat *curstat, int avgval, int nsecs)
582 }
583
584 detail_printdef procprt_STTIME =
585- { " STTIME ", "STTIME", procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
586+ { " STTIME ", "STTIME", .ac.doactiveconverts = procprt_STTIME_ae, procprt_STTIME_ae, ' ', 8};
587 /***************************************************************/
588 char *
589 procprt_ENDATE_a(struct tstat *curstat, int avgval, int nsecs)
590@@ -1197,7 +1197,7 @@ procprt_ENDATE_e(struct tstat *curstat, int avgval, int nsecs)
591 }
592
593 detail_printdef procprt_ENDATE =
594- { " ENDATE ", "ENDATE", procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
595+ { " ENDATE ", "ENDATE", .ac.doactiveconverts = procprt_ENDATE_a, procprt_ENDATE_e, ' ', 10};
596 /***************************************************************/
597 char *
598 procprt_ENTIME_a(struct tstat *curstat, int avgval, int nsecs)
599@@ -1220,7 +1220,7 @@ procprt_ENTIME_e(struct tstat *curstat, int avgval, int nsecs)
600 }
601
602 detail_printdef procprt_ENTIME =
603- { " ENTIME ", "ENTIME", procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
604+ { " ENTIME ", "ENTIME", .ac.doactiveconverts = procprt_ENTIME_a, procprt_ENTIME_e, ' ', 8};
605 /***************************************************************/
606 char *
607 procprt_THR_a(struct tstat *curstat, int avgval, int nsecs)
608@@ -1238,7 +1238,7 @@ procprt_THR_e(struct tstat *curstat, int avgval, int nsecs)
609 }
610
611 detail_printdef procprt_THR =
612- { " THR", "THR", procprt_THR_a, procprt_THR_e, ' ', 4};
613+ { " THR", "THR", .ac.doactiveconverts = procprt_THR_a, procprt_THR_e, ' ', 4};
614 /***************************************************************/
615 char *
616 procprt_TRUN_a(struct tstat *curstat, int avgval, int nsecs)
617@@ -1256,7 +1256,7 @@ procprt_TRUN_e(struct tstat *curstat, int avgval, int nsecs)
618 }
619
620 detail_printdef procprt_TRUN =
621- { "TRUN", "TRUN", procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
622+ { "TRUN", "TRUN", .ac.doactiveconverts = procprt_TRUN_a, procprt_TRUN_e, ' ', 4};
623 /***************************************************************/
624 char *
625 procprt_TSLPI_a(struct tstat *curstat, int avgval, int nsecs)
626@@ -1274,7 +1274,7 @@ procprt_TSLPI_e(struct tstat *curstat, int avgval, int nsecs)
627 }
628
629 detail_printdef procprt_TSLPI =
630- { "TSLPI", "TSLPI", procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
631+ { "TSLPI", "TSLPI", .ac.doactiveconverts = procprt_TSLPI_a, procprt_TSLPI_e, ' ', 5};
632 /***************************************************************/
633 char *
634 procprt_TSLPU_a(struct tstat *curstat, int avgval, int nsecs)
635@@ -1292,7 +1292,7 @@ procprt_TSLPU_e(struct tstat *curstat, int avgval, int nsecs)
636 }
637
638 detail_printdef procprt_TSLPU =
639- { "TSLPU", "TSLPU", procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
640+ { "TSLPU", "TSLPU", .ac.doactiveconverts = procprt_TSLPU_a, procprt_TSLPU_e, ' ', 5};
641 /***************************************************************/
642 char *
643 procprt_TIDLE_a(struct tstat *curstat, int avgval, int nsecs)
644@@ -1310,7 +1310,7 @@ procprt_TIDLE_e(struct tstat *curstat, int avgval, int nsecs)
645 }
646
647 detail_printdef procprt_TIDLE =
648- { "TIDLE", "TIDLE", procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
649+ { "TIDLE", "TIDLE", .ac.doactiveconverts = procprt_TIDLE_a, procprt_TIDLE_e, ' ', 5};
650 /***************************************************************/
651 #define SCHED_NORMAL 0
652 #define SCHED_FIFO 1
653@@ -1357,7 +1357,7 @@ procprt_POLI_e(struct tstat *curstat, int avgval, int nsecs)
654 }
655
656 detail_printdef procprt_POLI =
657- { "POLI", "POLI", procprt_POLI_a, procprt_POLI_e, ' ', 4};
658+ { "POLI", "POLI", .ac.doactiveconverts = procprt_POLI_a, procprt_POLI_e, ' ', 4};
659 /***************************************************************/
660 char *
661 procprt_NICE_a(struct tstat *curstat, int avgval, int nsecs)
662@@ -1375,7 +1375,7 @@ procprt_NICE_e(struct tstat *curstat, int avgval, int nsecs)
663 }
664
665 detail_printdef procprt_NICE =
666- { "NICE", "NICE", procprt_NICE_a, procprt_NICE_e, ' ', 4};
667+ { "NICE", "NICE", .ac.doactiveconverts = procprt_NICE_a, procprt_NICE_e, ' ', 4};
668 /***************************************************************/
669 char *
670 procprt_PRI_a(struct tstat *curstat, int avgval, int nsecs)
671@@ -1393,7 +1393,7 @@ procprt_PRI_e(struct tstat *curstat, int avgval, int nsecs)
672 }
673
674 detail_printdef procprt_PRI =
675- { "PRI", "PRI", procprt_PRI_a, procprt_PRI_e, ' ', 3};
676+ { "PRI", "PRI", .ac.doactiveconverts = procprt_PRI_a, procprt_PRI_e, ' ', 3};
677 /***************************************************************/
678 char *
679 procprt_RTPR_a(struct tstat *curstat, int avgval, int nsecs)
680@@ -1411,7 +1411,7 @@ procprt_RTPR_e(struct tstat *curstat, int avgval, int nsecs)
681 }
682
683 detail_printdef procprt_RTPR =
684- { "RTPR", "RTPR", procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
685+ { "RTPR", "RTPR", .ac.doactiveconverts = procprt_RTPR_a, procprt_RTPR_e, ' ', 4};
686 /***************************************************************/
687 char *
688 procprt_CURCPU_a(struct tstat *curstat, int avgval, int nsecs)
689@@ -1429,7 +1429,7 @@ procprt_CURCPU_e(struct tstat *curstat, int avgval, int nsecs)
690 }
691
692 detail_printdef procprt_CURCPU =
693- { "CPUNR", "CPUNR", procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
694+ { "CPUNR", "CPUNR", .ac.doactiveconverts = procprt_CURCPU_a, procprt_CURCPU_e, ' ', 5};
695 /***************************************************************/
696 char *
697 procprt_ST_a(struct tstat *curstat, int avgval, int nsecs)
698@@ -1473,7 +1473,7 @@ procprt_ST_e(struct tstat *curstat, int avgval, int nsecs)
699 }
700
701 detail_printdef procprt_ST =
702- { "ST", "ST", procprt_ST_a, procprt_ST_e, ' ', 2};
703+ { "ST", "ST", .ac.doactiveconverts = procprt_ST_a, procprt_ST_e, ' ', 2};
704 /***************************************************************/
705 char *
706 procprt_EXC_a(struct tstat *curstat, int avgval, int nsecs)
707@@ -1496,7 +1496,7 @@ procprt_EXC_e(struct tstat *curstat, int avgval, int nsecs)
708
709
710 detail_printdef procprt_EXC =
711- { "EXC", "EXC", procprt_EXC_a, procprt_EXC_e, ' ', 3};
712+ { "EXC", "EXC", .ac.doactiveconverts = procprt_EXC_a, procprt_EXC_e, ' ', 3};
713 /***************************************************************/
714 char *
715 procprt_S_a(struct tstat *curstat, int avgval, int nsecs)
716@@ -1515,7 +1515,7 @@ procprt_S_e(struct tstat *curstat, int avgval, int nsecs)
717 }
718
719 detail_printdef procprt_S =
720- { "S", "S", procprt_S_a, procprt_S_e, ' ', 1};
721+ { "S", "S", .ac.doactiveconverts = procprt_S_a, procprt_S_e, ' ', 1};
722
723 /***************************************************************/
724 char *
725@@ -1546,7 +1546,7 @@ procprt_COMMAND_LINE_ae(struct tstat *curstat, int avgval, int nsecs)
726 detail_printdef procprt_COMMAND_LINE =
727 { "COMMAND-LINE (horizontal scroll with <- and -> keys)",
728 "COMMAND-LINE",
729- procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
730+ .ac.doactiveconverts = procprt_COMMAND_LINE_ae, procprt_COMMAND_LINE_ae, ' ', 0, 1};
731 /***************************************************************/
732 char *
733 procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
734@@ -1558,7 +1558,7 @@ procprt_NPROCS_ae(struct tstat *curstat, int avgval, int nsecs)
735 }
736
737 detail_printdef procprt_NPROCS =
738- { "NPROCS", "NPROCS", procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
739+ { "NPROCS", "NPROCS", .ac.doactiveconverts = procprt_NPROCS_ae, procprt_NPROCS_ae, ' ', 6};
740 /***************************************************************/
741 char *
742 procprt_RDDSK_a(struct tstat *curstat, int avgval, int nsecs)
743@@ -1580,7 +1580,7 @@ procprt_RDDSK_e(struct tstat *curstat, int avgval, int nsecs)
744 }
745
746 detail_printdef procprt_RDDSK =
747- { " RDDSK", "RDDSK", procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
748+ { " RDDSK", "RDDSK", .ac.doactiveconverts = procprt_RDDSK_a, procprt_RDDSK_e, ' ', 6};
749 /***************************************************************/
750 char *
751 procprt_WRDSK_a(struct tstat *curstat, int avgval, int nsecs)
752@@ -1602,7 +1602,7 @@ procprt_WRDSK_e(struct tstat *curstat, int avgval, int nsecs)
753 }
754
755 detail_printdef procprt_WRDSK =
756- { " WRDSK", "WRDSK", procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
757+ { " WRDSK", "WRDSK", .ac.doactiveconverts = procprt_WRDSK_a, procprt_WRDSK_e, ' ', 6};
758 /***************************************************************/
759 char *
760 procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs)
761@@ -1621,7 +1621,7 @@ procprt_CWRDSK_a(struct tstat *curstat, int avgval, int nsecs)
762 }
763
764 detail_printdef procprt_CWRDSK =
765- {" WRDSK", "CWRDSK", procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
766+ {" WRDSK", "CWRDSK", .ac.doactiveconverts = procprt_CWRDSK_a, procprt_WRDSK_e, ' ', 6};
767 /***************************************************************/
768 char *
769 procprt_WCANCEL_a(struct tstat *curstat, int avgval, int nsecs)
770@@ -1643,7 +1643,7 @@ procprt_WCANCEL_e(struct tstat *curstat, int avgval, int nsecs)
771 }
772
773 detail_printdef procprt_WCANCEL =
774- {"WCANCL", "WCANCL", procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
775+ {"WCANCL", "WCANCL", .ac.doactiveconverts = procprt_WCANCEL_a, procprt_WCANCEL_e, ' ', 6};
776 /***************************************************************/
777 char *
778 procprt_TCPRCV_a(struct tstat *curstat, int avgval, int nsecs)
779@@ -1672,7 +1672,7 @@ procprt_TCPRCV_e(struct tstat *curstat, int avgval, int nsecs)
780
781
782 detail_printdef procprt_TCPRCV =
783- { "TCPRCV", "TCPRCV", procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
784+ { "TCPRCV", "TCPRCV", .ac.doactiveconverts = procprt_TCPRCV_a, procprt_TCPRCV_e, ' ', 6};
785 /***************************************************************/
786 char *
787 procprt_TCPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
788@@ -1704,7 +1704,7 @@ procprt_TCPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
789 }
790
791 detail_printdef procprt_TCPRASZ =
792- { "TCPRASZ", "TCPRASZ", procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
793+ { "TCPRASZ", "TCPRASZ", .ac.doactiveconverts = procprt_TCPRASZ_a, procprt_TCPRASZ_e, ' ', 7};
794 /***************************************************************/
795 char *
796 procprt_TCPSND_a(struct tstat *curstat, int avgval, int nsecs)
797@@ -1732,7 +1732,7 @@ procprt_TCPSND_e(struct tstat *curstat, int avgval, int nsecs)
798 }
799
800 detail_printdef procprt_TCPSND =
801- { "TCPSND", "TCPSND", procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
802+ { "TCPSND", "TCPSND", .ac.doactiveconverts = procprt_TCPSND_a, procprt_TCPSND_e, ' ', 6};
803 /***************************************************************/
804 char *
805 procprt_TCPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
806@@ -1764,7 +1764,7 @@ procprt_TCPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
807 }
808
809 detail_printdef procprt_TCPSASZ =
810- { "TCPSASZ", "TCPSASZ", procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
811+ { "TCPSASZ", "TCPSASZ", .ac.doactiveconverts = procprt_TCPSASZ_a, procprt_TCPSASZ_e, ' ', 7};
812 /***************************************************************/
813 char *
814 procprt_UDPRCV_a(struct tstat *curstat, int avgval, int nsecs)
815@@ -1793,7 +1793,7 @@ procprt_UDPRCV_e(struct tstat *curstat, int avgval, int nsecs)
816
817
818 detail_printdef procprt_UDPRCV =
819- { "UDPRCV", "UDPRCV", procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
820+ { "UDPRCV", "UDPRCV", .ac.doactiveconverts = procprt_UDPRCV_a, procprt_UDPRCV_e, ' ', 6};
821 /***************************************************************/
822 char *
823 procprt_UDPRASZ_a(struct tstat *curstat, int avgval, int nsecs)
824@@ -1826,7 +1826,7 @@ procprt_UDPRASZ_e(struct tstat *curstat, int avgval, int nsecs)
825
826
827 detail_printdef procprt_UDPRASZ =
828- { "UDPRASZ", "UDPRASZ", procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
829+ { "UDPRASZ", "UDPRASZ", .ac.doactiveconverts = procprt_UDPRASZ_a, procprt_UDPRASZ_e, ' ', 7};
830 /***************************************************************/
831 char *
832 procprt_UDPSND_a(struct tstat *curstat, int avgval, int nsecs)
833@@ -1854,7 +1854,7 @@ procprt_UDPSND_e(struct tstat *curstat, int avgval, int nsecs)
834 }
835
836 detail_printdef procprt_UDPSND =
837- { "UDPSND", "UDPSND", procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
838+ { "UDPSND", "UDPSND", .ac.doactiveconverts = procprt_UDPSND_a, procprt_UDPSND_e, ' ', 6};
839 /***************************************************************/
840 char *
841 procprt_UDPSASZ_a(struct tstat *curstat, int avgval, int nsecs)
842@@ -1887,7 +1887,7 @@ procprt_UDPSASZ_e(struct tstat *curstat, int avgval, int nsecs)
843
844
845 detail_printdef procprt_UDPSASZ =
846- { "UDPSASZ", "UDPSASZ", procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
847+ { "UDPSASZ", "UDPSASZ", .ac.doactiveconverts = procprt_UDPSASZ_a, procprt_UDPSASZ_e, ' ', 7};
848 /***************************************************************/
849 char *
850 procprt_RNET_a(struct tstat *curstat, int avgval, int nsecs)
851@@ -1917,7 +1917,7 @@ procprt_RNET_e(struct tstat *curstat, int avgval, int nsecs)
852 }
853
854 detail_printdef procprt_RNET =
855- { " RNET", "RNET", procprt_RNET_a, procprt_RNET_e, ' ', 5};
856+ { " RNET", "RNET", .ac.doactiveconverts = procprt_RNET_a, procprt_RNET_e, ' ', 5};
857 /***************************************************************/
858 char *
859 procprt_SNET_a(struct tstat *curstat, int avgval, int nsecs)
860@@ -1945,7 +1945,7 @@ procprt_SNET_e(struct tstat *curstat, int avgval, int nsecs)
861 }
862
863 detail_printdef procprt_SNET =
864- { " SNET", "SNET", procprt_SNET_a, procprt_SNET_e, ' ', 5};
865+ { " SNET", "SNET", .ac.doactiveconverts = procprt_SNET_a, procprt_SNET_e, ' ', 5};
866 /***************************************************************/
867 char *
868 procprt_BANDWI_a(struct tstat *curstat, int avgval, int nsecs)
869@@ -1974,7 +1974,7 @@ procprt_BANDWI_e(struct tstat *curstat, int avgval, int nsecs)
870 }
871
872 detail_printdef procprt_BANDWI =
873- { " BANDWI", "BANDWI", procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
874+ { " BANDWI", "BANDWI", .ac.doactiveconverts = procprt_BANDWI_a, procprt_BANDWI_e, ' ', 9};
875 /***************************************************************/
876 char *
877 procprt_BANDWO_a(struct tstat *curstat, int avgval, int nsecs)
878@@ -2003,7 +2003,7 @@ procprt_BANDWO_e(struct tstat *curstat, int avgval, int nsecs)
879 }
880
881 detail_printdef procprt_BANDWO =
882- { " BANDWO", "BANDWO", procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
883+ { " BANDWO", "BANDWO", .ac.doactiveconverts = procprt_BANDWO_a, procprt_BANDWO_e, ' ', 9};
884 /***************************************************************/
885 static void
886 format_bandw(char *buf, count_t kbps)
887@@ -2069,7 +2069,7 @@ procprt_GPULIST_ae(struct tstat *curstat, int avgval, int nsecs)
888 }
889
890 detail_printdef procprt_GPULIST =
891- { " GPUNUMS", "GPULIST", procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
892+ { " GPUNUMS", "GPULIST", .ac.doactiveconverts = procprt_GPULIST_ae, procprt_GPULIST_ae, ' ', 8};
893 /***************************************************************/
894 char *
895 procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
896@@ -2084,7 +2084,7 @@ procprt_GPUMEMNOW_ae(struct tstat *curstat, int avgval, int nsecs)
897 }
898
899 detail_printdef procprt_GPUMEMNOW =
900- { "MEMNOW", "GPUMEM", procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
901+ { "MEMNOW", "GPUMEM", .ac.doactiveconverts = procprt_GPUMEMNOW_ae, procprt_GPUMEMNOW_ae, ' ', 6};
902 /***************************************************************/
903 char *
904 procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
905@@ -2103,7 +2103,7 @@ procprt_GPUMEMAVG_ae(struct tstat *curstat, int avgval, int nsecs)
906 }
907
908 detail_printdef procprt_GPUMEMAVG =
909- { "MEMAVG", "GPUMEMAVG", procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
910+ { "MEMAVG", "GPUMEMAVG", .ac.doactiveconverts = procprt_GPUMEMAVG_ae, procprt_GPUMEMAVG_ae, ' ', 6};
911 /***************************************************************/
912 char *
913 procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
914@@ -2121,7 +2121,7 @@ procprt_GPUGPUBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
915 }
916
917 detail_printdef procprt_GPUGPUBUSY =
918- { "GPUBUSY", "GPUGPUBUSY", procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
919+ { "GPUBUSY", "GPUGPUBUSY", .ac.doactiveconverts = procprt_GPUGPUBUSY_ae, procprt_GPUGPUBUSY_ae, ' ', 7};
920 /***************************************************************/
921 char *
922 procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
923@@ -2139,7 +2139,7 @@ procprt_GPUMEMBUSY_ae(struct tstat *curstat, int avgval, int nsecs)
924 }
925
926 detail_printdef procprt_GPUMEMBUSY =
927- { "MEMBUSY", "GPUMEMBUSY", procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
928+ { "MEMBUSY", "GPUMEMBUSY", .ac.doactiveconverts = procprt_GPUMEMBUSY_ae, procprt_GPUMEMBUSY_ae, ' ', 7};
929 /***************************************************************/
930 char *
931 procprt_WCHAN_a(struct tstat *curstat, int avgval, int nsecs)
932@@ -2164,7 +2164,7 @@ procprt_WCHAN_e(struct tstat *curstat, int avgval, int nsecs)
933 }
934
935 detail_printdef procprt_WCHAN =
936- { "WCHAN ", "WCHAN", procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
937+ { "WCHAN ", "WCHAN", .ac.doactiveconverts = procprt_WCHAN_a, procprt_WCHAN_e, ' ', 15};
938 /***************************************************************/
939 char *
940 procprt_RUNDELAY_a(struct tstat *curstat, int avgval, int nsecs)
941@@ -2185,7 +2185,7 @@ procprt_RUNDELAY_e(struct tstat *curstat, int avgval, int nsecs)
942 }
943
944 detail_printdef procprt_RUNDELAY =
945- { "RDELAY", "RDELAY", procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
946+ { "RDELAY", "RDELAY", .ac.doactiveconverts = procprt_RUNDELAY_a, procprt_RUNDELAY_e, ' ', 6};
947 /***************************************************************/
948 char *
949 procprt_BLKDELAY_a(struct tstat *curstat, int avgval, int nsecs)
950@@ -2206,7 +2206,7 @@ procprt_BLKDELAY_e(struct tstat *curstat, int avgval, int nsecs)
951 }
952
953 detail_printdef procprt_BLKDELAY =
954- { "BDELAY", "BDELAY", procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
955+ { "BDELAY", "BDELAY", .ac.doactiveconverts = procprt_BLKDELAY_a, procprt_BLKDELAY_e, ' ', 6};
956 /***************************************************************/
957 char *
958 procprt_NVCSW_a(struct tstat *curstat, int avgval, int nsecs)
959@@ -2224,7 +2224,7 @@ procprt_NVCSW_e(struct tstat *curstat, int avgval, int nsecs)
960 }
961
962 detail_printdef procprt_NVCSW =
963- { " NVCSW", "NVCSW", procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
964+ { " NVCSW", "NVCSW", .ac.doactiveconverts = procprt_NVCSW_a, procprt_NVCSW_e, ' ', 6};
965 /***************************************************************/
966 char *
967 procprt_NIVCSW_a(struct tstat *curstat, int avgval, int nsecs)
968@@ -2242,7 +2242,7 @@ procprt_NIVCSW_e(struct tstat *curstat, int avgval, int nsecs)
969 }
970
971 detail_printdef procprt_NIVCSW =
972- { "NIVCSW", "NIVCSW", procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
973+ { "NIVCSW", "NIVCSW", .ac.doactiveconverts = procprt_NIVCSW_a, procprt_NIVCSW_e, ' ', 6};
974 /***************************************************************/
975 char *
976 procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
977@@ -2251,7 +2251,7 @@ procprt_SORTITEM_ae(struct tstat *curstat, int avgval, int nsecs)
978 }
979
980 detail_printdef procprt_SORTITEM = // width is dynamically defined!
981- { 0, "SORTITEM", procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
982+ { 0, "SORTITEM", .ac.doactiveconverts = procprt_SORTITEM_ae, procprt_SORTITEM_ae, ' ', 4};
983
984
985 /***************************************************************/
986@@ -2382,7 +2382,7 @@ showcgroupline(detail_printpair* elemptr,
987
988 color = 0;
989
990- buf = curelem.pf->doactiveconvert(cgchain, tstat,
991+ buf = curelem.pf->ac.doactiveconvertc(cgchain, tstat,
992 avgval, nsecs, cputicks, nrcpu, &color);
993
994 if (screen)
995@@ -2513,7 +2513,7 @@ cgroup_CGROUP_PATH(struct cgchainer *cgchain, struct tstat *tstat,
996
997 detail_printdef cgroupprt_CGROUP_PATH =
998 {"CGROUP (scroll: <- ->) ", "CGRPATH",
999- cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
1000+ .ac.doactiveconvertc = cgroup_CGROUP_PATH, NULL, ' ', 26, 0};
1001 /***************************************************************/
1002 char *
1003 cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
1004@@ -2530,7 +2530,7 @@ cgroup_CGRNPROCS(struct cgchainer *cgchain, struct tstat *tstat,
1005 }
1006
1007 detail_printdef cgroupprt_CGRNPROCS =
1008- { "NPROCS", "CGRNPROCS", cgroup_CGRNPROCS, NULL, ' ', 6};
1009+ { "NPROCS", "CGRNPROCS", .ac.doactiveconvertc = cgroup_CGRNPROCS, NULL, ' ', 6};
1010 /***************************************************************/
1011 char *
1012 cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
1013@@ -2547,7 +2547,7 @@ cgroup_CGRNPROCSB(struct cgchainer *cgchain, struct tstat *tstat,
1014 }
1015
1016 detail_printdef cgroupprt_CGRNPROCSB =
1017- { "PBELOW", "CGRNPROCSB", cgroup_CGRNPROCSB, NULL, ' ', 6};
1018+ { "PBELOW", "CGRNPROCSB", .ac.doactiveconvertc = cgroup_CGRNPROCSB, NULL, ' ', 6};
1019 /***************************************************************/
1020 char *
1021 cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
1022@@ -2599,7 +2599,7 @@ cgroup_CGRCPUBUSY(struct cgchainer *cgchain, struct tstat *tstat,
1023 }
1024
1025 detail_printdef cgroupprt_CGRCPUBUSY =
1026- { "CPUBUSY", "CGRCPUBUSY", cgroup_CGRCPUBUSY, NULL, 'C', 7};
1027+ { "CPUBUSY", "CGRCPUBUSY", .ac.doactiveconvertc = cgroup_CGRCPUBUSY, NULL, 'C', 7};
1028 /***************************************************************/
1029 char *
1030 cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
1031@@ -2629,7 +2629,7 @@ cgroup_CGRCPUPSI(struct cgchainer *cgchain, struct tstat *tstat,
1032 }
1033
1034 detail_printdef cgroupprt_CGRCPUPSI =
1035- { "CPUPS", "CGRCPUPSI", cgroup_CGRCPUPSI, NULL, ' ', 5};
1036+ { "CPUPS", "CGRCPUPSI", .ac.doactiveconvertc = cgroup_CGRCPUPSI, NULL, ' ', 5};
1037 /***************************************************************/
1038 char *
1039 cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
1040@@ -2672,7 +2672,7 @@ cgroup_CGRCPUMAX(struct cgchainer *cgchain, struct tstat *tstat,
1041 }
1042
1043 detail_printdef cgroupprt_CGRCPUMAX =
1044- { "CPUMAX", "CGRCPUMAX", cgroup_CGRCPUMAX, NULL, ' ', 6};
1045+ { "CPUMAX", "CGRCPUMAX", .ac.doactiveconvertc = cgroup_CGRCPUMAX, NULL, ' ', 6};
1046 /***************************************************************/
1047 char *
1048 cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
1049@@ -2695,7 +2695,7 @@ cgroup_CGRCPUWGT(struct cgchainer *cgchain, struct tstat *tstat,
1050 }
1051
1052 detail_printdef cgroupprt_CGRCPUWGT =
1053- { "CPUWGT", "CGRCPUWGT", cgroup_CGRCPUWGT, NULL, ' ', 6};
1054+ { "CPUWGT", "CGRCPUWGT", .ac.doactiveconvertc = cgroup_CGRCPUWGT, NULL, ' ', 6};
1055 /***************************************************************/
1056 char *
1057 cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
1058@@ -2740,7 +2740,7 @@ cgroup_CGRMEMORY(struct cgchainer *cgchain, struct tstat *tstat,
1059 }
1060
1061 detail_printdef cgroupprt_CGRMEMORY =
1062- { "MEMORY", "CGRMEMORY", cgroup_CGRMEMORY, NULL, 'M', 6};
1063+ { "MEMORY", "CGRMEMORY", .ac.doactiveconvertc = cgroup_CGRMEMORY, NULL, 'M', 6};
1064 /***************************************************************/
1065 char *
1066 cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
1067@@ -2770,7 +2770,7 @@ cgroup_CGRMEMPSI(struct cgchainer *cgchain, struct tstat *tstat,
1068 }
1069
1070 detail_printdef cgroupprt_CGRMEMPSI =
1071- { "MEMPS", "CGRMEMPSI", cgroup_CGRMEMPSI, NULL, ' ', 5};
1072+ { "MEMPS", "CGRMEMPSI", .ac.doactiveconvertc = cgroup_CGRMEMPSI, NULL, ' ', 5};
1073 /***************************************************************/
1074 char *
1075 cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
1076@@ -2810,7 +2810,7 @@ cgroup_CGRMEMMAX(struct cgchainer *cgchain, struct tstat *tstat,
1077 }
1078
1079 detail_printdef cgroupprt_CGRMEMMAX =
1080- { "MEMMAX", "CGRMEMMAX", cgroup_CGRMEMMAX, NULL, ' ', 6};
1081+ { "MEMMAX", "CGRMEMMAX", .ac.doactiveconvertc = cgroup_CGRMEMMAX, NULL, ' ', 6};
1082 /***************************************************************/
1083 char *
1084 cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
1085@@ -2835,7 +2835,7 @@ cgroup_CGRSWPMAX(struct cgchainer *cgchain, struct tstat *tstat,
1086 }
1087
1088 detail_printdef cgroupprt_CGRSWPMAX =
1089- { "SWPMAX", "CGRSWPMAX", cgroup_CGRSWPMAX, NULL, ' ', 6};
1090+ { "SWPMAX", "CGRSWPMAX", .ac.doactiveconvertc = cgroup_CGRSWPMAX, NULL, ' ', 6};
1091 /***************************************************************/
1092 char *
1093 cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
1094@@ -2864,7 +2864,7 @@ cgroup_CGRDISKIO(struct cgchainer *cgchain, struct tstat *tstat,
1095 }
1096
1097 detail_printdef cgroupprt_CGRDISKIO =
1098- { "DISKIO", "CGRDISKIO", cgroup_CGRDISKIO, NULL, 'D', 6};
1099+ { "DISKIO", "CGRDISKIO", .ac.doactiveconvertc = cgroup_CGRDISKIO, NULL, 'D', 6};
1100 /***************************************************************/
1101 char *
1102 cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
1103@@ -2894,7 +2894,7 @@ cgroup_CGRDSKPSI(struct cgchainer *cgchain, struct tstat *tstat,
1104 }
1105
1106 detail_printdef cgroupprt_CGRDSKPSI =
1107- { "DSKPS", "CGRDSKPSI", cgroup_CGRDSKPSI, NULL, ' ', 5};
1108+ { "DSKPS", "CGRDSKPSI", .ac.doactiveconvertc = cgroup_CGRDSKPSI, NULL, ' ', 5};
1109 /***************************************************************/
1110 char *
1111 cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
1112@@ -2917,7 +2917,7 @@ cgroup_CGRDSKWGT(struct cgchainer *cgchain, struct tstat *tstat,
1113 }
1114
1115 detail_printdef cgroupprt_CGRDSKWGT =
1116- { "IOWGT", "CGRDSKWGT", cgroup_CGRDSKWGT, NULL, ' ', 5};
1117+ { "IOWGT", "CGRDSKWGT", .ac.doactiveconvertc = cgroup_CGRDSKWGT, NULL, ' ', 5};
1118 /***************************************************************/
1119 char *
1120 cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
1121@@ -2934,7 +2934,7 @@ cgroup_CGRPID(struct cgchainer *cgchain, struct tstat *tstat,
1122 }
1123
1124 detail_printdef cgroupprt_CGRPID =
1125- { "PID", "CGRPID", cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
1126+ { "PID", "CGRPID", .ac.doactiveconvertc = cgroup_CGRPID, NULL, ' ', 5}; //DYNAMIC WIDTH!
1127 /***************************************************************/
1128 char *
1129 cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
1130@@ -2963,5 +2963,5 @@ cgroup_CGRCMD(struct cgchainer *cgchain, struct tstat *tstat,
1131 }
1132
1133 detail_printdef cgroupprt_CGRCMD =
1134- { "CMD ", "CGRCMD", cgroup_CGRCMD, NULL, ' ', 14};
1135+ { "CMD ", "CGRCMD", .ac.doactiveconvertc = cgroup_CGRCMD, NULL, ' ', 14};
1136 /***************************************************************/
1137diff --git a/various.c b/various.c
1138index c175c10..906a529 100644
1139--- a/various.c
1140+++ b/various.c
1141@@ -29,6 +29,10 @@
1142 ** Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1143 ** --------------------------------------------------------------------------
1144 */
1145+#define _POSIX_C_SOURCE
1146+#define _XOPEN_SOURCE
1147+#define _GNU_SOURCE
1148+#define _DEFAULT_SOURCE
1149
1150 #include <sys/types.h>
1151 #include <sys/param.h>
1152--
11532.34.1
1154
diff --git a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch b/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
deleted file mode 100644
index facb257be6..0000000000
--- a/meta-oe/recipes-support/atop/atop/0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch
+++ /dev/null
@@ -1,67 +0,0 @@
1From ffc8ba8d324243a923abe48e9758adecb03d24a4 Mon Sep 17 00:00:00 2001
2From: Peter Kjellerstedt <pkj@axis.com>
3Date: Tue, 12 Feb 2019 21:25:23 +0100
4Subject: [PATCH] atop.daily, atop.init, atop-pm.sh: Avoid using bash
5
6Avoid using bash and bashisms when not necesary. On some systems,
7e.g., embedded products, bash may not be available by default.
8
9Upstream-Status: Submitted [https://github.com/Atoptool/atop/pull/50]
10Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
11---
12 atop-pm.sh | 2 +-
13 atop.daily | 4 ++--
14 atop.init | 4 ++--
15 3 files changed, 5 insertions(+), 5 deletions(-)
16
17diff --git a/atop-pm.sh b/atop-pm.sh
18index 7f41a86..3ff4ab5 100755
19--- a/atop-pm.sh
20+++ b/atop-pm.sh
21@@ -1,4 +1,4 @@
22-#!/bin/bash
23+#!/bin/sh
24
25 case "$1" in
26 pre) /usr/bin/systemctl stop atop
27diff --git a/atop.daily b/atop.daily
28index 57a9507..fe5a11b 100755
29--- a/atop.daily
30+++ b/atop.daily
31@@ -1,4 +1,4 @@
32-#!/bin/bash
33+#!/bin/sh
34
35 LOGOPTS="-R" # default options
36 LOGINTERVAL=600 # default interval in seconds
37@@ -38,7 +38,7 @@ then
38
39 while ps -p `cat "$PIDFILE"` > /dev/null
40 do
41- let CNT+=1
42+ CNT=$((CNT + 1))
43
44 if [ $CNT -gt 5 ]
45 then
46diff --git a/atop.init b/atop.init
47index e6e11dc..03c3f02 100755
48--- a/atop.init
49+++ b/atop.init
50@@ -1,4 +1,4 @@
51-#!/bin/bash
52+#!/bin/sh
53 #
54 # atop Startup script for the Atop process logging in background
55 #
56@@ -47,7 +47,7 @@ case "$1" in
57
58 while ps -p `cat $PIDFILE` > /dev/null
59 do
60- let CNT+=1
61+ CNT=$((CNT + 1))
62
63 if [ $CNT -gt 5 ]
64 then
65--
662.12.0
67
diff --git a/meta-oe/recipes-support/atop/atop/fix-permissions.patch b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
index 8488b38000..10f504b472 100644
--- a/meta-oe/recipes-support/atop/atop/fix-permissions.patch
+++ b/meta-oe/recipes-support/atop/atop/fix-permissions.patch
@@ -8,24 +8,32 @@ everyone could read.
8 8
9Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10Signed-off-by: Kai Kang <kai.kang@windriver.com> 10Signed-off-by: Kai Kang <kai.kang@windriver.com>
11Signed-off-by: Tho Dat Nguyen <tho3.nguyen@lge.com>
11--- 12---
12 Makefile | 10 +++++----- 13 Makefile | 16 ++++++++--------
13 1 file changed, 5 insertions(+), 5 deletions(-) 14 1 file changed, 8 insertions(+), 8 deletions(-)
14 15
15diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
16index 3bf5929..1221ee4 100644 17index a6f196b..7786f93 100644
17--- a/Makefile 18--- a/Makefile
18+++ b/Makefile 19+++ b/Makefile
19@@ -72,7 +72,7 @@ systemdinstall: genericinstall 20@@ -77,7 +77,7 @@ install: genericinstall
20 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service 21 cp atopacct.service $(DESTDIR)$(SYSDPATH)
21 cp atop.cronsystemd $(DESTDIR)$(CRNPATH)/atop 22 chmod 0644 $(DESTDIR)$(SYSDPATH)/atopacct.service
22 cp atop-pm.sh $(DESTDIR)$(PMPATHD) 23 cp atop-pm.sh $(DESTDIR)$(PMPATHD)
23- chmod 0711 $(DESTDIR)$(PMPATHD)/atop-pm.sh 24- chmod 0711 $(DESTDIR)$(PMPATHD)/atop-pm.sh
24+ chmod 0755 $(DESTDIR)$(PMPATHD)/atop-pm.sh 25+ chmod 0755 $(DESTDIR)$(PMPATHD)/atop-pm.sh
25 # 26 #
26 # only when making on target system: 27 # only when making on target system:
27 # 28 #
28@@ -97,11 +97,11 @@ sysvinstall: genericinstall 29@@ -107,17 +107,17 @@ sysvinstall: genericinstall
30 cp atopacct.init $(DESTDIR)$(INIPATH)/atopacct
31 cp atop.cronsysv $(DESTDIR)$(CRNPATH)/atop
32 cp atop.daily $(DESTDIR)$(SCRPATH)
33- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily
34+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily
35 touch $(DESTDIR)$(LOGPATH)/dummy_before
36 touch $(DESTDIR)$(LOGPATH)/dummy_after
29 # 37 #
30 if [ -d $(DESTDIR)$(PMPATH1) ]; \ 38 if [ -d $(DESTDIR)$(PMPATH1) ]; \
31 then cp 45atoppm $(DESTDIR)$(PMPATH1); \ 39 then cp 45atoppm $(DESTDIR)$(PMPATH1); \
@@ -39,21 +47,27 @@ index 3bf5929..1221ee4 100644
39 fi 47 fi
40 # 48 #
41 # 49 #
42@@ -145,7 +145,7 @@ genericinstall: atop atopacctd atopconvert 50@@ -160,7 +160,7 @@ genericinstall: atop atopacctd atopconvert atopcat atophide
51 chmod 644 $(DESTDIR)$(DEFPATH)/atop
43 # 52 #
44 cp atop $(DESTDIR)$(BINPATH)/atop 53 cp atop $(DESTDIR)$(BINPATH)/atop
45 chown root $(DESTDIR)$(BINPATH)/atop 54- chmod 0711 $(DESTDIR)$(BINPATH)/atop
46- chmod 04711 $(DESTDIR)$(BINPATH)/atop
47+ chmod 0755 $(DESTDIR)$(BINPATH)/atop 55+ chmod 0755 $(DESTDIR)$(BINPATH)/atop
48 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar 56 ln -sf atop $(DESTDIR)$(BINPATH)/atopsar
49 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd 57 cp atopacctd $(DESTDIR)$(SBINPATH)/atopacctd
50 chown root $(DESTDIR)$(SBINPATH)/atopacctd 58 chmod 0700 $(DESTDIR)$(SBINPATH)/atopacctd
51@@ -159,7 +159,7 @@ genericinstall: atop atopacctd atopconvert 59@@ -169,11 +169,11 @@ genericinstall: atop atopacctd atopconvert atopcat atophide
52 chown root $(DESTDIR)$(BINPATH)/atopconvert 60 cp atop $(DESTDIR)$(BINPATH)/atop-$(VERS)
53 chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert 61 ln -sf atop-$(VERS) $(DESTDIR)$(BINPATH)/atopsar-$(VERS)
54 cp atop.daily $(DESTDIR)$(SCRPATH) 62 cp atopconvert $(DESTDIR)$(BINPATH)/atopconvert
55- chmod 0711 $(DESTDIR)$(SCRPATH)/atop.daily 63- chmod 0711 $(DESTDIR)$(BINPATH)/atopconvert
56+ chmod 0755 $(DESTDIR)$(SCRPATH)/atop.daily 64+ chmod 0755 $(DESTDIR)$(BINPATH)/atopconvert
65 cp atopcat $(DESTDIR)$(BINPATH)/atopcat
66- chmod 0711 $(DESTDIR)$(BINPATH)/atopcat
67+ chmod 0755 $(DESTDIR)$(BINPATH)/atopcat
68 cp atophide $(DESTDIR)$(BINPATH)/atophide
69- chmod 0711 $(DESTDIR)$(BINPATH)/atophide
70+ chmod 0755 $(DESTDIR)$(BINPATH)/atophide
57 cp man/atop.1 $(DESTDIR)$(MAN1PATH) 71 cp man/atop.1 $(DESTDIR)$(MAN1PATH)
58 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH) 72 cp man/atopsar.1 $(DESTDIR)$(MAN1PATH)
59 cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH) 73 cp man/atopconvert.1 $(DESTDIR)$(MAN1PATH)
diff --git a/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-oe/recipes-support/atop/atop_2.11.0.bb
index 4b0e74227b..8eb8cd6b06 100644
--- a/meta-oe/recipes-support/atop/atop_2.4.0.bb
+++ b/meta-oe/recipes-support/atop/atop_2.11.0.bb
@@ -13,18 +13,23 @@ SECTION = "console/utils"
13LICENSE = "GPL-2.0-only" 13LICENSE = "GPL-2.0-only"
14LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833" 14LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
15 15
16DEPENDS = "ncurses zlib" 16inherit pkgconfig
17
18DEPENDS = "ncurses zlib glib-2.0"
17 19
18SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ 20SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \
19 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'file://volatiles.atop.conf', 'file://volatiles.99_atop', d)} \
20 file://fix-permissions.patch \ 22 file://fix-permissions.patch \
21 file://sysvinit-implement-status.patch \ 23 file://sysvinit-implement-status.patch \
22 file://0001-atop.daily-atop.init-atop-pm.sh-Avoid-using-bash.patch \ 24 file://0001-Redefine-function-prototypes-solves-issue-322.patch \
23 " 25 "
24SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" 26SRC_URI[sha256sum] = "9b94c666602efff7bf402ecce706c347f38c39cb63498f9d39626861e5646e20"
25SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" 27
28UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php"
29UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar"
26 30
27CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 31CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
32TARGET_CC_ARCH += "${LDFLAGS}"
28 33
29do_compile() { 34do_compile() {
30 oe_runmake all 35 oe_runmake all
@@ -33,7 +38,7 @@ do_compile() {
33do_install() { 38do_install() {
34 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then 39 if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
35 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \ 40 make DESTDIR=${D} VERS=${PV} SYSDPATH=${systemd_system_unitdir} \
36 PMPATHD=${systemd_unitdir}/system-sleep systemdinstall 41 PMPATHD=${systemd_unitdir}/system-sleep install
37 install -d ${D}${sysconfdir}/tmpfiles.d 42 install -d ${D}${sysconfdir}/tmpfiles.d
38 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf 43 install -m 644 ${UNPACKDIR}/volatiles.atop.conf ${D}${sysconfdir}/tmpfiles.d/atop.conf
39 rm -f ${D}${systemd_system_unitdir}/atopacct.service 44 rm -f ${D}${systemd_system_unitdir}/atopacct.service
@@ -54,9 +59,9 @@ do_install() {
54 59
55inherit systemd 60inherit systemd
56 61
57SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service" 62SYSTEMD_SERVICE:${PN} = "atop.service atopgpu.service atop-rotate.service"
58SYSTEMD_AUTO_ENABLE = "disable" 63SYSTEMD_AUTO_ENABLE = "disable"
59 64
60FILES:${PN} += "${systemd_unitdir}/system-sleep" 65FILES:${PN} += "${systemd_unitdir}/system-sleep ${systemd_system_unitdir}/atop-rotate.timer"
61 66
62RDEPENDS:${PN} = "procps" 67RDEPENDS:${PN} = "procps"
diff --git a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
index 2c6d4cdc88..14e818253b 100644
--- a/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
+++ b/meta-oe/recipes-support/augeas/augeas_1.12.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "http://download.augeas.net/${BP}.tar.gz \
9 file://sepbuildfix.patch \ 9 file://sepbuildfix.patch \
10 file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \ 10 file://0001-src-internal-Use-__GLIBC__-to-check-for-GNU-extentio.patch \
11 " 11 "
12SRC_URI[md5sum] = "74f1c7b8550f4e728486091f6b907175"
13SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87" 12SRC_URI[sha256sum] = "321942c9cc32185e2e9cb72d0a70eea106635b50269075aca6714e3ec282cb87"
14 13
15DEPENDS = "readline libxml2" 14DEPENDS = "readline libxml2"
diff --git a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
index 6ec25bdd2b..c1e8863fb3 100644
--- a/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
+++ b/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb
@@ -15,8 +15,13 @@ SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \
15 file://0003-Update-CXX-standard-to-CXX14.patch \ 15 file://0003-Update-CXX-standard-to-CXX14.patch \
16 " 16 "
17 17
18S = "${WORKDIR}/git/lang/c++" 18S = "${UNPACKDIR}/${BP}/lang/c++"
19 19
20inherit cmake pkgconfig 20inherit cmake pkgconfig
21 21
22BBCLASSEXTEND = "native nativesdk" 22BBCLASSEXTEND = "native nativesdk"
23
24# http://errors.yoctoproject.org/Errors/Details/766913/
25# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
26# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference]
27CXXFLAGS += "-Wno-error=dangling-reference"
diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch
new file mode 100644
index 0000000000..bfe2ea6367
--- /dev/null
+++ b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch
@@ -0,0 +1,59 @@
1From 52f051dbeefad0b7e73187becad6c33747b047d3 Mon Sep 17 00:00:00 2001
2From: Sahil Kang <sahil.kang@asilaycomputing.com>
3Date: Mon, 11 Mar 2024 03:01:21 -0700
4Subject: [PATCH] AVRO-3957: [C] Fix typos in docs and examples (#2795)
5
6* AVRO-3957: [C] Fix misformatted type in docs
7
8Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
9Signed-off-by: Sahil Kang <sahilkang@google.com>
10
11* AVRO-3957: [C] Fix type in quickstop example
12
13This removes the following warning:
14
15 avro/lang/c/examples/quickstop.c:123:40: warning: incompatible pointer types passing 'int32_t **' (aka 'int **') to parameter of type
16 'const char **' [-Wincompatible-pointer-types]
17 avro_value_get_string(&first_value, &p, &size);
18
19Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
20Signed-off-by: Sahil Kang <sahilkang@google.com>
21
22---------
23
24Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
25Signed-off-by: Sahil Kang <sahilkang@google.com>
26
27Upstream-Status: Backport [52f051dbee AVRO-3957: [C] Fix typos in docs and examples (#2795)]
28Signed-off-by: mark.yang <mark.yang@lge.com>
29---
30 lang/c/docs/index.txt | 2 +-
31 lang/c/examples/quickstop.c | 2 +-
32 2 files changed, 2 insertions(+), 2 deletions(-)
33
34diff --git a/lang/c/docs/index.txt b/lang/c/docs/index.txt
35index a439a0526..df16f9d96 100644
36--- a/lang/c/docs/index.txt
37+++ b/lang/c/docs/index.txt
38@@ -178,7 +178,7 @@ different versions of the Avro library. That means that it's really
39 only safe to use these hash values internally within the context of a
40 single execution of a single application.
41
42-The +reset+ method “clears out” an +avro_value_t instance, making sure
43+The +reset+ method “clears out” an +avro_value_t+ instance, making sure
44 that it's ready to accept the contents of a new value. For scalars,
45 this is usually a no-op, since the new value will just overwrite the old
46 one. For arrays and maps, this removes any existing elements from the
47diff --git a/lang/c/examples/quickstop.c b/lang/c/examples/quickstop.c
48index ff9e97005..b26dad10c 100644
49--- a/lang/c/examples/quickstop.c
50+++ b/lang/c/examples/quickstop.c
51@@ -107,7 +107,7 @@ int print_person(avro_file_reader_t db, avro_schema_t reader_schema)
52 if (rval == 0) {
53 int64_t id;
54 int32_t age;
55- int32_t *p;
56+ const char *p;
57 size_t size;
58 avro_value_t id_value;
59 avro_value_t first_value;
diff --git a/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch
new file mode 100644
index 0000000000..8f7bbc868a
--- /dev/null
+++ b/meta-oe/recipes-support/avro/avro-c/0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch
@@ -0,0 +1,386 @@
1From 03ea96b48f7e668abd9f3b33799635e4e50a526c Mon Sep 17 00:00:00 2001
2From: Sahil Kang <sahilkang@google.com>
3Date: Mon, 25 Mar 2024 04:41:41 -0700
4Subject: [PATCH] AVRO-3960: [C] Fix st ANYARGS warning (#2798)
5
6This removes the following warning:
7
8 avro/lang/c/src/st.c:240:13: warning: passing arguments to a function without a prototype is deprecated in all versions of C and is not
9 supported in C2x [-Wdeprecated-non-prototype]
10 hash_val = do_hash(key, table);
11
12Signed-off-by: Sahil Kang <sahil.kang@asilaycomputing.com>
13Signed-off-by: Sahil Kang <sahilkang@google.com>
14
15Upstream-Status: Backport [03ea96b48f AVRO-3960: [C] Fix st ANYARGS warning (#2798)]
16Signed-off-by: mark.yang <mark.yang@lge.com>
17---
18 lang/c/src/datum.c | 12 ++++++------
19 lang/c/src/datum_equal.c | 4 ++--
20 lang/c/src/datum_size.c | 2 +-
21 lang/c/src/datum_validate.c | 2 +-
22 lang/c/src/memoize.c | 6 +++---
23 lang/c/src/schema.c | 10 +++++-----
24 lang/c/src/st.c | 34 ++++++++++++++++++----------------
25 lang/c/src/st.h | 22 +++++++++-------------
26 8 files changed, 45 insertions(+), 47 deletions(-)
27
28diff --git a/lang/c/src/datum.c b/lang/c/src/datum.c
29index 53dfa5ca0..5307c7a83 100644
30--- a/lang/c/src/datum.c
31+++ b/lang/c/src/datum.c
32@@ -1095,7 +1095,7 @@ static void avro_datum_free(avro_datum_t datum)
33 record = avro_datum_to_record(datum);
34 avro_schema_decref(record->schema);
35 st_foreach(record->fields_byname,
36- HASH_FUNCTION_CAST char_datum_free_foreach, 0);
37+ (hash_function_foreach) char_datum_free_foreach, 0);
38 st_free_table(record->field_order);
39 st_free_table(record->fields_byname);
40 avro_freet(struct avro_record_datum_t, record);
41@@ -1123,7 +1123,7 @@ static void avro_datum_free(avro_datum_t datum)
42 struct avro_map_datum_t *map;
43 map = avro_datum_to_map(datum);
44 avro_schema_decref(map->schema);
45- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach,
46+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach,
47 0);
48 st_free_table(map->map);
49 st_free_table(map->indices_by_key);
50@@ -1135,7 +1135,7 @@ static void avro_datum_free(avro_datum_t datum)
51 struct avro_array_datum_t *array;
52 array = avro_datum_to_array(datum);
53 avro_schema_decref(array->schema);
54- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0);
55+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0);
56 st_free_table(array->els);
57 avro_freet(struct avro_array_datum_t, array);
58 }
59@@ -1183,7 +1183,7 @@ avro_datum_reset(avro_datum_t datum)
60 {
61 struct avro_array_datum_t *array;
62 array = avro_datum_to_array(datum);
63- st_foreach(array->els, HASH_FUNCTION_CAST array_free_foreach, 0);
64+ st_foreach(array->els, (hash_function_foreach) array_free_foreach, 0);
65 st_free_table(array->els);
66
67 rval = avro_init_array(array);
68@@ -1198,7 +1198,7 @@ avro_datum_reset(avro_datum_t datum)
69 {
70 struct avro_map_datum_t *map;
71 map = avro_datum_to_map(datum);
72- st_foreach(map->map, HASH_FUNCTION_CAST char_datum_free_foreach, 0);
73+ st_foreach(map->map, (hash_function_foreach) char_datum_free_foreach, 0);
74 st_free_table(map->map);
75 st_free_table(map->indices_by_key);
76 st_free_table(map->keys_by_index);
77@@ -1217,7 +1217,7 @@ avro_datum_reset(avro_datum_t datum)
78 record = avro_datum_to_record(datum);
79 rval = 0;
80 st_foreach(record->fields_byname,
81- HASH_FUNCTION_CAST datum_reset_foreach, (st_data_t) &rval);
82+ (hash_function_foreach) datum_reset_foreach, (st_data_t) &rval);
83 return rval;
84 }
85
86diff --git a/lang/c/src/datum_equal.c b/lang/c/src/datum_equal.c
87index 3875bea04..7e7c9b940 100644
88--- a/lang/c/src/datum_equal.c
89+++ b/lang/c/src/datum_equal.c
90@@ -78,7 +78,7 @@ static int map_equal(struct avro_map_datum_t *a, struct avro_map_datum_t *b)
91 if (a->map->num_entries != b->map->num_entries) {
92 return 0;
93 }
94- st_foreach(a->map, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args);
95+ st_foreach(a->map, (hash_function_foreach) st_equal_foreach, (st_data_t) & args);
96 return args.rval;
97 }
98
99@@ -93,7 +93,7 @@ static int record_equal(struct avro_record_datum_t *a,
100 if (a->fields_byname->num_entries != b->fields_byname->num_entries) {
101 return 0;
102 }
103- st_foreach(a->fields_byname, HASH_FUNCTION_CAST st_equal_foreach, (st_data_t) & args);
104+ st_foreach(a->fields_byname, (hash_function_foreach) st_equal_foreach, (st_data_t) & args);
105 return args.rval;
106 }
107
108diff --git a/lang/c/src/datum_size.c b/lang/c/src/datum_size.c
109index be9b98004..3877f3138 100644
110--- a/lang/c/src/datum_size.c
111+++ b/lang/c/src/datum_size.c
112@@ -126,7 +126,7 @@ size_map(avro_writer_t writer, const avro_encoding_t * enc,
113 if (datum->map->num_entries) {
114 size_accum(rval, size,
115 enc->size_long(writer, datum->map->num_entries));
116- st_foreach(datum->map, HASH_FUNCTION_CAST size_map_foreach, (st_data_t) & args);
117+ st_foreach(datum->map, (hash_function_foreach) size_map_foreach, (st_data_t) & args);
118 size += args.size;
119 }
120 if (!args.rval) {
121diff --git a/lang/c/src/datum_validate.c b/lang/c/src/datum_validate.c
122index 6167bd63f..e997d3067 100644
123--- a/lang/c/src/datum_validate.c
124+++ b/lang/c/src/datum_validate.c
125@@ -123,7 +123,7 @@ avro_schema_datum_validate(avro_schema_t expected_schema, avro_datum_t datum)
126 { avro_schema_to_map(expected_schema)->values, 1
127 };
128 st_foreach(avro_datum_to_map(datum)->map,
129- HASH_FUNCTION_CAST schema_map_validate_foreach,
130+ (hash_function_foreach) schema_map_validate_foreach,
131 (st_data_t) & vst);
132 return vst.rval;
133 }
134diff --git a/lang/c/src/memoize.c b/lang/c/src/memoize.c
135index 933fecbd0..e3602884d 100644
136--- a/lang/c/src/memoize.c
137+++ b/lang/c/src/memoize.c
138@@ -52,8 +52,8 @@ avro_memoize_key_hash(avro_memoize_key_t *a)
139
140
141 static struct st_hash_type avro_memoize_hash_type = {
142- HASH_FUNCTION_CAST avro_memoize_key_cmp,
143- HASH_FUNCTION_CAST avro_memoize_key_hash
144+ (hash_function_compare) avro_memoize_key_cmp,
145+ (hash_function_hash) avro_memoize_key_hash
146 };
147
148
149@@ -78,7 +78,7 @@ avro_memoize_free_key(avro_memoize_key_t *key, void *result, void *dummy)
150 void
151 avro_memoize_done(avro_memoize_t *mem)
152 {
153- st_foreach((st_table *) mem->cache, HASH_FUNCTION_CAST avro_memoize_free_key, 0);
154+ st_foreach((st_table *) mem->cache, (hash_function_foreach) avro_memoize_free_key, 0);
155 st_free_table((st_table *) mem->cache);
156 memset(mem, 0, sizeof(avro_memoize_t));
157 }
158diff --git a/lang/c/src/schema.c b/lang/c/src/schema.c
159index 2acad51a1..a4d8e9f89 100644
160--- a/lang/c/src/schema.c
161+++ b/lang/c/src/schema.c
162@@ -137,7 +137,7 @@ static void avro_schema_free(avro_schema_t schema)
163 if (record->space) {
164 avro_str_free(record->space);
165 }
166- st_foreach(record->fields, HASH_FUNCTION_CAST record_free_foreach,
167+ st_foreach(record->fields, (hash_function_foreach) record_free_foreach,
168 0);
169 st_free_table(record->fields_byname);
170 st_free_table(record->fields);
171@@ -152,7 +152,7 @@ static void avro_schema_free(avro_schema_t schema)
172 if (enump->space) {
173 avro_str_free(enump->space);
174 }
175- st_foreach(enump->symbols, HASH_FUNCTION_CAST enum_free_foreach,
176+ st_foreach(enump->symbols, (hash_function_foreach) enum_free_foreach,
177 0);
178 st_free_table(enump->symbols);
179 st_free_table(enump->symbols_byname);
180@@ -189,7 +189,7 @@ static void avro_schema_free(avro_schema_t schema)
181 case AVRO_UNION:{
182 struct avro_union_schema_t *unionp;
183 unionp = avro_schema_to_union(schema);
184- st_foreach(unionp->branches, HASH_FUNCTION_CAST union_free_foreach,
185+ st_foreach(unionp->branches, (hash_function_foreach) union_free_foreach,
186 0);
187 st_free_table(unionp->branches);
188 st_free_table(unionp->branches_byname);
189@@ -1239,7 +1239,7 @@ avro_schema_from_json_root(json_t *root, avro_schema_t *schema)
190 /* json_dumpf(root, stderr, 0); */
191 rval = avro_schema_from_json_t(root, schema, named_schemas, NULL);
192 json_decref(root);
193- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0);
194+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0);
195 st_free_table(named_schemas);
196 return rval;
197 }
198@@ -1455,7 +1455,7 @@ avro_schema_t avro_schema_copy(avro_schema_t schema)
199 }
200
201 new_schema = avro_schema_copy_root(schema, named_schemas);
202- st_foreach(named_schemas, HASH_FUNCTION_CAST named_schema_free_foreach, 0);
203+ st_foreach(named_schemas, (hash_function_foreach) named_schema_free_foreach, 0);
204 st_free_table(named_schemas);
205 return new_schema;
206 }
207diff --git a/lang/c/src/st.c b/lang/c/src/st.c
208index 27578289e..8437777cb 100644
209--- a/lang/c/src/st.c
210+++ b/lang/c/src/st.c
211@@ -39,8 +39,8 @@ struct st_table_entry {
212 static int numcmp(long, long);
213 static int numhash(long);
214 static struct st_hash_type type_numhash = {
215- HASH_FUNCTION_CAST numcmp,
216- HASH_FUNCTION_CAST numhash
217+ (hash_function_compare) numcmp,
218+ (hash_function_hash) numhash
219 };
220
221 /*
222@@ -48,8 +48,8 @@ static struct st_hash_type type_numhash = {
223 */
224 static int strhash(const char *);
225 static struct st_hash_type type_strhash = {
226- HASH_FUNCTION_CAST strcmp,
227- HASH_FUNCTION_CAST strhash
228+ (hash_function_compare) strcmp,
229+ (hash_function_hash) strhash
230 };
231
232 static void rehash(st_table *);
233@@ -212,7 +212,7 @@ void st_free_table(st_table *table)
234 }
235
236 #define PTR_NOT_EQUAL(table, ptr, hash_val, key) \
237-((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (key), (ptr)->key)))
238+((ptr) != 0 && (ptr->hash != (hash_val) || !EQUAL((table), (void*) (key), (void*) (ptr)->key)))
239
240 #ifdef HASH_LOG
241 #define COLLISION collision++
242@@ -237,7 +237,7 @@ int st_lookup(st_table *table, register st_data_t key, st_data_t *value)
243 unsigned int hash_val, bin_pos;
244 register st_table_entry *ptr;
245
246- hash_val = do_hash(key, table);
247+ hash_val = do_hash((void*) key, table);
248 FIND_ENTRY(table, ptr, hash_val, bin_pos);
249
250 if (ptr == 0) {
251@@ -272,7 +272,7 @@ int st_insert(register st_table *table, register st_data_t key, st_data_t value)
252 unsigned int hash_val, bin_pos;
253 register st_table_entry *ptr;
254
255- hash_val = do_hash(key, table);
256+ hash_val = do_hash((void*) key, table);
257 FIND_ENTRY(table, ptr, hash_val, bin_pos);
258
259 if (ptr == 0) {
260@@ -288,7 +288,7 @@ void st_add_direct(st_table *table,st_data_t key,st_data_t value)
261 {
262 unsigned int hash_val, bin_pos;
263
264- hash_val = do_hash(key, table);
265+ hash_val = do_hash((void*) key, table);
266 bin_pos = hash_val % table->num_bins;
267 ADD_DIRECT(table, key, value, hash_val, bin_pos);
268 }
269@@ -363,7 +363,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
270 st_table_entry *tmp;
271 register st_table_entry *ptr;
272
273- hash_val = do_hash_bin(*key, table);
274+ hash_val = do_hash_bin((void*) *key, table);
275 ptr = table->bins[hash_val];
276
277 if (ptr == 0) {
278@@ -372,7 +372,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
279 return 0;
280 }
281
282- if (EQUAL(table, *key, ptr->key)) {
283+ if (EQUAL(table, (void*) *key, (void*) ptr->key)) {
284 table->bins[hash_val] = ptr->next;
285 table->num_entries--;
286 if (value != 0)
287@@ -383,7 +383,7 @@ int st_delete(register st_table *table,register st_data_t *key,st_data_t *value)
288 }
289
290 for (; ptr->next != 0; ptr = ptr->next) {
291- if (EQUAL(table, ptr->next->key, *key)) {
292+ if (EQUAL(table, (void*) ptr->next->key, (void*) *key)) {
293 tmp = ptr->next;
294 ptr->next = ptr->next->next;
295 table->num_entries--;
296@@ -403,7 +403,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v
297 unsigned int hash_val;
298 register st_table_entry *ptr;
299
300- hash_val = do_hash_bin(*key, table);
301+ hash_val = do_hash_bin((void*) *key, table);
302 ptr = table->bins[hash_val];
303
304 if (ptr == 0) {
305@@ -413,7 +413,7 @@ int st_delete_safe(register st_table *table,register st_data_t *key,st_data_t *v
306 }
307
308 for (; ptr != 0; ptr = ptr->next) {
309- if ((ptr->key != never) && EQUAL(table, ptr->key, *key)) {
310+ if ((ptr->key != never) && EQUAL(table, (void*) ptr->key, (void*) *key)) {
311 table->num_entries--;
312 *key = ptr->key;
313 if (value != 0)
314@@ -439,11 +439,11 @@ void st_cleanup_safe(st_table *table,st_data_t never)
315 {
316 int num_entries = table->num_entries;
317
318- st_foreach(table, HASH_FUNCTION_CAST delete_never, never);
319+ st_foreach(table, (hash_function_foreach) delete_never, never);
320 table->num_entries = num_entries;
321 }
322
323-int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg)
324+int st_foreach(st_table *table,int (*func) (void*, void*, void*),st_data_t arg)
325 {
326 st_table_entry *ptr, *last, *tmp;
327 enum st_retval retval;
328@@ -452,7 +452,9 @@ int st_foreach(st_table *table,int (*func) (ANYARGS),st_data_t arg)
329 for (i = 0; i < table->num_bins; i++) {
330 last = 0;
331 for (ptr = table->bins[i]; ptr != 0;) {
332- retval = (enum st_retval) (*func) (ptr->key, ptr->record, arg);
333+ retval = (enum st_retval) (*func) ((void*) ptr->key,
334+ (void*) ptr->record,
335+ (void*) arg);
336 switch (retval) {
337 case ST_CHECK: /* check if hash is modified during
338 * iteration */
339diff --git a/lang/c/src/st.h b/lang/c/src/st.h
340index cf8a22491..93da018bd 100644
341--- a/lang/c/src/st.h
342+++ b/lang/c/src/st.h
343@@ -20,26 +20,22 @@ extern "C" {
344
345 #pragma GCC visibility push(hidden)
346
347-#ifndef ANYARGS
348- #ifdef __cplusplus
349- #define ANYARGS ...
350- #else
351- #define ANYARGS
352- #endif
353-#endif
354-
355 #ifdef _WIN32
356- #define HASH_FUNCTION_CAST (int (__cdecl *)(ANYARGS))
357+ typedef int (__cdecl *hash_function_compare)(void*, void*);
358+ typedef int (__cdecl *hash_function_hash)(void*);
359+ typedef int (__cdecl *hash_function_foreach)(void*, void*, void*);
360 #else
361- #define HASH_FUNCTION_CAST
362+ typedef int (*hash_function_compare)(void*, void*);
363+ typedef int (*hash_function_hash)(void*);
364+ typedef int (*hash_function_foreach)(void*, void*, void*);
365 #endif
366
367 typedef uintptr_t st_data_t;
368 typedef struct st_table st_table;
369
370 struct st_hash_type {
371- int (*compare) (ANYARGS);
372- int (*hash) (ANYARGS);
373+ hash_function_compare compare;
374+ hash_function_hash hash;
375 };
376
377 struct st_table {
378@@ -67,7 +63,7 @@ int st_delete _((st_table *, st_data_t *, st_data_t *));
379 int st_delete_safe _((st_table *, st_data_t *, st_data_t *, st_data_t));
380 int st_insert _((st_table *, st_data_t, st_data_t));
381 int st_lookup _((st_table *, st_data_t, st_data_t *));
382-int st_foreach _((st_table *, int (*)(ANYARGS), st_data_t));
383+int st_foreach _((st_table *, hash_function_foreach, st_data_t));
384 void st_add_direct _((st_table *, st_data_t, st_data_t));
385 void st_free_table _((st_table *));
386 void st_cleanup_safe _((st_table *, st_data_t));
diff --git a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
index bb7f53e459..f7da323710 100644
--- a/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
+++ b/meta-oe/recipes-support/avro/avro-c_1.11.3.bb
@@ -8,10 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6d502b41f76179fc84e536236f359cae"
8DEPENDS = "jansson zlib xz" 8DEPENDS = "jansson zlib xz"
9 9
10BRANCH = "branch-1.11" 10BRANCH = "branch-1.11"
11SRCREV = "35ff8b997738e4d983871902d47bfb67b3250734" 11SRCREV = "579a36762293fa4c9f2831e27e7af7713a0838a0"
12SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ 12SRC_URI = " \
13 " 13 git://github.com/apache/avro;branch=${BRANCH};protocol=https \
14 14 file://0001-AVRO-3960-C-Fix-st-ANYARGS-warning-2798.patch;patchdir=../.. \
15S = "${WORKDIR}/git/lang/c" 15 file://0001-AVRO-3957-C-Fix-typos-in-docs-and-examples-2795.patch;patchdir=../.. \
16"
17S = "${UNPACKDIR}/${BP}/lang/c"
16 18
17inherit cmake pkgconfig 19inherit cmake pkgconfig
diff --git a/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
new file mode 100644
index 0000000000..bab1d1f301
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu/0001-CMakeLists-do-not-use-vendored-libcurl.patch
@@ -0,0 +1,45 @@
1From 678c32f867931fd9f410b6e46ea8d101714c7ed5 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Leonard=20G=C3=B6hrs?= <l.goehrs@pengutronix.de>
3Date: Tue, 6 May 2025 07:45:36 +0200
4Subject: [PATCH] CMakeLists: do not use vendored libcurl
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Upstream-Status: Inappropriate [upstream ticket https://github.com/nxp-imx/bcu/issues/17]
10
11Signed-off-by: Leonard Göhrs <l.goehrs@pengutronix.de>
12---
13 CMakeLists.txt | 10 +++++-----
14 1 file changed, 5 insertions(+), 5 deletions(-)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 42158a2..ac840fc 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -17,17 +17,17 @@ pkg_check_modules(LIBFTDI REQUIRED libftdi1)
21 pkg_check_modules(LIBYAML REQUIRED yaml-0.1)
22 pkg_check_modules(LIBOPENSSL REQUIRED openssl)
23 pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
24+pkg_check_modules(LIBCURL REQUIRED libcurl)
25 project(bcu)
26-include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${PROJECT_SOURCE_DIR}/libftdi/src ${LIBYAML_INCLUDEDIR} ${PROJECT_SOURCE_DIR}/libcurl/include)
27+include_directories(${LIBUSB_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}include ${LIBYAML_INCLUDEDIR})
28 include_directories(${PROJECT_SOURCE_DIR})
29
30 message("operation system is ${CMAKE_SYSTEM}")
31 if (LINUX)
32 add_executable(bcu bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
33- link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS})
34- target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${PROJECT_SOURCE_DIR}/libcurl/build.bcu/lib/libcurl.a -lpthread -lssl -lcrypto -lm -ldl)
35- execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR}
36- COMMAND ${PROJECT_SOURCE_DIR}/build_libs.sh ${PROJECT_SOURCE_DIR})
37+ link_directories(${LIBUSB_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS} ${LIBYAML_LIBRARY_DIRS} ${LIBCURL_LIBRARY_DIRS})
38+ target_link_libraries (bcu ${LIBUSB_LIBRARIES} ${LIBFTDI_LIBRARIES} ${LIBYAML_LIBRARIES} ${LIBCURL_LIBRARIES} -lpthread -lssl -lcrypto -lm -ldl)
39+ execute_process( COMMAND ${PROJECT_SOURCE_DIR}/create_version_h.sh ${PROJECT_SOURCE_DIR})
40 install(TARGETS bcu DESTINATION bin)
41 elseif (MACOS)
42 add_executable(bcu_mac bcu.c port.c chip.c board.c bcu_parser.c bcu_yaml.c bcu_https.c bcu_ftdi_eeprom.c)
43--
442.39.5
45
diff --git a/meta-oe/recipes-support/bcu/bcu_1.1.115.bb b/meta-oe/recipes-support/bcu/bcu_1.1.115.bb
new file mode 100644
index 0000000000..260fba02a9
--- /dev/null
+++ b/meta-oe/recipes-support/bcu/bcu_1.1.115.bb
@@ -0,0 +1,22 @@
1SUMMARY = "NXP Board Control Utilities"
2DESCRIPTION = "The NXP Board Control Utilities are able to control various \
3 features of NXP i.MX evaluation boards (EVK) from a host \
4 computer. \
5 Features like resetting the board, selecting the boot mode, \
6 monitoring power consumption, programming the EEPROM and others"
7HOMEPAGE = "https://github.com/nxp-imx/bcu"
8SECTION = "devel"
9LICENSE = "BSD-3-Clause"
10LIC_FILES_CHKSUM = "file://LICENSE;md5=884d48c2aa7b82e1ad4a33909fab24b6"
11
12SRC_URI = "git://github.com/nxp-imx/bcu;protocol=https;branch=master \
13 file://0001-CMakeLists-do-not-use-vendored-libcurl.patch \
14 "
15SRCREV = "f081c69c26e330cf03ec790051c415c4716509d9"
16
17
18DEPENDS = "curl libyaml libusb1 openssl libftdi"
19
20inherit cmake pkgconfig
21
22BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
index a5a7a63657..3c8c41cc03 100644
--- a/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb
+++ b/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb
@@ -23,10 +23,9 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075"
23 23
24DEPENDS = "libatomic-ops" 24DEPENDS = "libatomic-ops"
25 25
26SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" 26SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855"
27SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" 27SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https"
28 28
29S = "${WORKDIR}/git"
30 29
31inherit autotools pkgconfig 30inherit autotools pkgconfig
32 31
diff --git a/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb
new file mode 100644
index 0000000000..f49aa480da
--- /dev/null
+++ b/meta-oe/recipes-support/bmap-writer/bmap-writer_1.0.2.bb
@@ -0,0 +1,19 @@
1SUMMARY = "bmaptool alternative written in C++"
2DESCRIPTION = "bmap-writer is a command-line utility designed to efficiently write disk images \
3to storage devices using block mapping (BMAP). It serves as \
4a lightweight alternative to the Yocto BMAP tool, \
5bmap-writer is C++ based does not require Python and focuses solely on writing an image."
6HOMEPAGE = "https://github.com/embetrix/bmap-writer"
7SECTION = "console/utils"
8LICENSE = "GPL-3.0-only"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=e49f4652534af377a713df3d9dec60cb"
10
11SRC_URI = "git://github.com/embetrix/${BPN};branch=master;protocol=https"
12SRCREV = "7489280a7a1247f23543343aba4e95bf2f2e8fa6"
13
14DEPENDS = "libtinyxml2 libarchive"
15inherit cmake pkgconfig
16
17FILES:${PN} = "${bindir}"
18
19BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.12.bb
index a48195a15d..0a2514237a 100644
--- a/meta-oe/recipes-support/boost-sml/boost-sml_1.1.11.bb
+++ b/meta-oe/recipes-support/boost-sml/boost-sml_1.1.12.bb
@@ -9,9 +9,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=e4224ccaecb14d942c71d31bef20d78c"
9DEPENDS += "boost qemu-native" 9DEPENDS += "boost qemu-native"
10 10
11SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master" 11SRC_URI = "git://github.com/boost-ext/sml.git;protocol=https;branch=master"
12SRCREV = "b7df6180d20422b2724d26007aebb24066f2a6a9" 12SRCREV = "cd3ef80206b71463de96d6b682cfdc99703ec147"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit cmake
17 16
diff --git a/meta-oe/recipes-support/btop/btop_1.3.2.bb b/meta-oe/recipes-support/btop/btop_1.4.3.bb
index c473bf0a35..9a5a21c56d 100644
--- a/meta-oe/recipes-support/btop/btop_1.3.2.bb
+++ b/meta-oe/recipes-support/btop/btop_1.4.3.bb
@@ -4,10 +4,10 @@ LICENSE = "Apache-2.0"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
5SECTION = "console/utils" 5SECTION = "console/utils"
6 6
7SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main" 7SRC_URI = "git://github.com/aristocratos/btop.git;protocol=https;branch=main;tag=v${PV} \
8SRCREV = "fd2a2acdad6fbaad76846cb5e802cf2ae022d670" 8 "
9SRCREV = "3f1ccd9f6c455fef6d4d8cfbc8ed71b86961323d"
9 10
10S = "${WORKDIR}/git"
11 11
12inherit cmake 12inherit cmake
13 13
diff --git a/meta-oe/recipes-support/bvi/bvi_1.4.2.bb b/meta-oe/recipes-support/bvi/bvi_1.4.2.bb
new file mode 100644
index 0000000000..fb136e16a6
--- /dev/null
+++ b/meta-oe/recipes-support/bvi/bvi_1.4.2.bb
@@ -0,0 +1,17 @@
1SUMMARY = "Binary VI editor"
2DESCRIPTION = "bvi is a visual editor for binary files."
3HOMEPAGE = "https://sourceforge.net/projects/bvi"
4SECTION = "console/utils"
5LICENSE = "GPL-3.0-or-later"
6LIC_FILES_CHKSUM = "file://COPYING;md5=a36207309d382da27cd66fdaae922e3c"
7
8SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz"
9SRC_URI[sha256sum] = "4bba16c2b496963a9b939336c0abcc8d488664492080ae43a86da18cf4ce94f2"
10
11DEPENDS += "ncurses"
12
13# The project uses old style C interfaces and it is not compatible with C23
14# it builds fine with C17, specifying gnu17 as the C dialect to use
15CFLAGS:append = " -std=gnu17 -Wno-old-style-definition"
16
17inherit pkgconfig autotools-brokensep
diff --git a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb b/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
index ddd081e115..b6945f221d 100644
--- a/meta-oe/recipes-support/c-ares/c-ares_1.27.0.bb
+++ b/meta-oe/recipes-support/c-ares/c-ares_1.34.5.bb
@@ -1,13 +1,13 @@
1# Copyright (c) 2012-2014 LG Electronics, Inc. 1# Copyright (c) 2012-2014 LG Electronics, Inc.
2SUMMARY = "c-ares is a C library that resolves names asynchronously." 2SUMMARY = "c-ares is a C library that resolves names asynchronously."
3HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" 3HOMEPAGE = "https://c-ares.org/"
4SECTION = "libs" 4SECTION = "libs"
5LICENSE = "MIT" 5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fdbc58a6da11a9f68aa73c453818decc" 6LIC_FILES_CHKSUM = "file://LICENSE.md;md5=d3e72a10e08191f2ca1be3f3228d78f3"
7 7
8SRC_URI = "https://github.com/c-ares/c-ares/releases/download/cares-1_27_0/${BPN}-${PV}.tar.gz \ 8SRC_URI = "https://github.com/c-ares/c-ares/releases/download/v${PV}/${BPN}-${PV}.tar.gz \
9 file://run-ptest" 9 file://run-ptest"
10SRC_URI[sha256sum] = "0a72be66959955c43e2af2fbd03418e82a2bd5464604ec9a62147e37aceb420b" 10SRC_URI[sha256sum] = "7d935790e9af081c25c495fd13c2cfcda4792983418e96358ef6e7320ee06346"
11 11
12PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" 12PACKAGECONFIG ?= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
13PACKAGECONFIG[manpages] = "" 13PACKAGECONFIG[manpages] = ""
diff --git a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.3.bb
index 8e38517448..058ede614e 100644
--- a/meta-oe/recipes-support/c-periphery/c-periphery_2.4.2.bb
+++ b/meta-oe/recipes-support/c-periphery/c-periphery_2.4.3.bb
@@ -6,12 +6,11 @@ HOMEPAGE = "https://github.com/vsergeev/c-periphery"
6SECTION = "libs" 6SECTION = "libs"
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=be30d45bdc453f70a494c149c2168289" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=e88456d0a60de4c71ff4d787c212f253"
10 10
11SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master" 11SRC_URI = "git://github.com/vsergeev/c-periphery;protocol=https;branch=master"
12SRCREV = "91f9678d2a35a3af3c633f20165bdde8bea32209" 12SRCREV = "911e989fe41eb90c7df274cb54555346caf2a632"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit cmake
17 16
diff --git a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
index bf62e8416e..9d905cc22e 100644
--- a/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/frame_2.5.0.bb
@@ -17,7 +17,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/v${PV}/+download/${BPN}-${PV}.tar.
17 17
18UPSTREAM_CHECK_URI = "https://launchpad.net/frame/trunk" 18UPSTREAM_CHECK_URI = "https://launchpad.net/frame/trunk"
19 19
20SRC_URI[md5sum] = "02baa941091c5d198cd1623b3ad36e68"
21SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f" 20SRC_URI[sha256sum] = "cfb9ab52cdccd926f1822a457264d0014c7eb9f4600a72626063dd073b26256f"
22 21
23PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" 22PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
diff --git a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
index 139649b975..2ac535d258 100644
--- a/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/geis_2.2.17.bb
@@ -27,7 +27,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.x
27 27
28UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk" 28UPSTREAM_CHECK_URI = "https://launchpad.net/geis/trunk"
29 29
30SRC_URI[md5sum] = "2ff9d76a3ea5794516bb02c9d1924faf"
31SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb" 30SRC_URI[sha256sum] = "8a60f5683852094038904e690d23cc5a90a980fc52da67f0f28890baa25c70eb"
32 31
33EXTRA_OECONF = "--disable-integration-tests" 32EXTRA_OECONF = "--disable-integration-tests"
diff --git a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
index 067052c036..1a5900b78b 100644
--- a/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
+++ b/meta-oe/recipes-support/canonical-multitouch/grail_3.1.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "https://launchpad.net/${BPN}/trunk/${PV}/+download/${BPN}-${PV}.tar.b
16 16
17UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk" 17UPSTREAM_CHECK_URI = "https://launchpad.net/grail/trunk"
18 18
19SRC_URI[md5sum] = "0df1b3ec6167920f310e2effe6e2ad44"
20SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3" 19SRC_URI[sha256sum] = "5eed1f650f042481daa3a2de5e7d43261fe343b2a1b1e240f3b7fc26572c9df3"
21 20
22REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" 21REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}"
diff --git a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
index 18db0721de..63500def05 100644
--- a/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
+++ b/meta-oe/recipes-support/ceres-solver/ceres-solver_2.2.0.bb
@@ -8,7 +8,6 @@ DEPENDS = "libeigen glog"
8SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https" 8SRC_URI = "git://github.com/ceres-solver/ceres-solver.git;branch=master;protocol=https"
9SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01" 9SRCREV = "85331393dc0dff09f6fb9903ab0c4bfa3e134b01"
10 10
11S = "${WORKDIR}/git"
12 11
13inherit cmake 12inherit cmake
14 13
diff --git a/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-oe/recipes-support/ckermit/ckermit_302.bb
index 1ee776cefe..f5d6d9d4f8 100644
--- a/meta-oe/recipes-support/ckermit/ckermit_302.bb
+++ b/meta-oe/recipes-support/ckermit/ckermit_302.bb
@@ -11,9 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING.TXT;md5=932ca542d6c6cb8a59a0bcd76ab67cc3"
11SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \ 11SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subdir=${BPN}-${PV} \
12 file://0001-Fix-function-prototype-errors.patch \ 12 file://0001-Fix-function-prototype-errors.patch \
13 " 13 "
14SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0"
15SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" 14SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711"
16 15
16UPSTREAM_CHECK_URI = "https://www.kermitproject.org/ck90.html"
17UPSTREAM_CHECK_REGEX = "cku(?P<pver>\d+)\.tar"
17 18
18export CC2 = "${CC}" 19export CC2 = "${CC}"
19export BINDIR = "${bindir}" 20export BINDIR = "${bindir}"
@@ -28,7 +29,7 @@ do_compile () {
28 # The original makefile doesn't differentiate between CC and CC_FOR_BUILD, 29 # The original makefile doesn't differentiate between CC and CC_FOR_BUILD,
29 # so we build wart manually. Note that you need a ckwart.o with the proper 30 # so we build wart manually. Note that you need a ckwart.o with the proper
30 # timestamp to make this hack work: 31 # timestamp to make this hack work:
31 ${BUILD_CC} -c ckwart.c 32 ${BUILD_CC} -DMAINTYPE=int -c -o ckwart.o ckwart.c
32 ${BUILD_CC} -o wart ckwart.o 33 ${BUILD_CC} -o wart ckwart.o
33 ./wart ckcpro.w ckcpro.c 34 ./wart ckcpro.w ckcpro.c
34 35
@@ -45,7 +46,8 @@ do_compile () {
45 -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \ 46 -DNORESEND -DNOAUTODL -DNOSTREAMING -DNOHINTS -DNOCKXYZ -DNOLEARN \
46 -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \ 47 -DNOMKDIR -DNOPERMS -DNOCKTIMERS -DNOCKREGEX -DNOREALPATH \
47 -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \ 48 -DCK_SMALL -DNOLOGDIAL -DNORENAME -DNOWHATAMI \
48 -DNOARROWKEYS -DMAINTYPE=int" 49 -DNOARROWKEYS -DMAINTYPE=int \
50 -D_DEFAULT_SOURCE -ansi"
49} 51}
50 52
51do_install () { 53do_install () {
@@ -55,3 +57,11 @@ do_install () {
55 rm ${D}${BINDIR}/kermit-sshsub 57 rm ${D}${BINDIR}/kermit-sshsub
56 (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb) 58 (cd ${D}${BINDIR} && ln -s ${BINDIR}/kermit kermit-sshusb)
57} 59}
60
61# This one is reproducible only on 32bit MACHINEs
62# http://errors.yoctoproject.org/Errors/Details/766966/
63# ckutio.c:12057:10: error: passing argument 1 of 'time' from incompatible pointer type [-Wincompatible-pointer-types]
64# ckutio.c:12058:20: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
65# ckufio.c:5043:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
66# ckufio.c:5263:32: error: passing argument 1 of 'localtime' from incompatible pointer type [-Wincompatible-pointer-types]
67CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
index ef3c951bbf..346ccd6c69 100644
--- a/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
+++ b/meta-oe/recipes-support/cli11/cli11_2.3.2.bb
@@ -11,7 +11,6 @@ SRC_URI += "gitsm://github.com/CLIUtils/CLI11;branch=main;protocol=https \
11 file://0001-Do-not-download-the-catch-framework-during-configure.patch" 11 file://0001-Do-not-download-the-catch-framework-during-configure.patch"
12 12
13SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc" 13SRC_URI[sha256sum] = "ea379c4a3cb5799027b1eb451163dff065a3d641aaba23bf4e24ee6b536bd9bc"
14S = "${WORKDIR}/git"
15 14
16do_configure:prepend() { 15do_configure:prepend() {
17 mkdir -p ${S}/tests/catch2 16 mkdir -p ${S}/tests/catch2
diff --git a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb
index ce8b4cd493..bbbb36dace 100644
--- a/meta-oe/recipes-support/cmark/cmark_0.31.0.bb
+++ b/meta-oe/recipes-support/cmark/cmark_0.31.1.bb
@@ -4,8 +4,7 @@ LICENSE = "BSD-2-Clause & MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" 4LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62"
5 5
6SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" 6SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https"
7SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" 7SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8"
8S = "${WORKDIR}/git"
9 8
10inherit cmake lib_package 9inherit cmake lib_package
11 10
diff --git a/meta-oe/recipes-support/colord/colord-native.bb b/meta-oe/recipes-support/colord/colord-native.bb
index 64dd94a9ed..2c79be4957 100644
--- a/meta-oe/recipes-support/colord/colord-native.bb
+++ b/meta-oe/recipes-support/colord/colord-native.bb
@@ -1,7 +1,5 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-native:"
4
5inherit meson pkgconfig native 3inherit meson pkgconfig native
6 4
7DEPENDS += " \ 5DEPENDS += " \
diff --git a/meta-oe/recipes-support/colord/colord.bb b/meta-oe/recipes-support/colord/colord.bb
index e300222518..6eb9db8dab 100644
--- a/meta-oe/recipes-support/colord/colord.bb
+++ b/meta-oe/recipes-support/colord/colord.bb
@@ -1,28 +1,33 @@
1require ${BPN}.inc 1require ${BPN}.inc
2 2
3inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig 3inherit meson gobject-introspection gsettings gtk-doc gettext bash-completion systemd features_check useradd pkgconfig
4 4
5# polkit and gobject-introspection are mandatory and cannot be configured 5# polkit and gobject-introspection are mandatory and cannot be configured
6REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" 6REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data"
7GIR_MESON_OPTION = "" 7GIR_MESON_OPTION = ""
8 8
9DEPENDS += " \ 9DEPENDS += " \
10 ${BPN}-native \ 10 ${BPN}-native \
11 glib-2.0 \ 11 dbus \
12 lcms \ 12 glib-2.0 \
13 sqlite3 \ 13 lcms \
14 libgusb \ 14 libgudev \
15 libgudev \ 15 libgusb \
16 polkit \ 16 polkit \
17 sqlite3 \
17" 18"
18 19
20RDEPENDS:${PN} += "hwdata"
21
19SRC_URI += " \ 22SRC_URI += " \
20 file://0001-Run-native-cd_idt8-cd_create_profile.patch \ 23 file://0001-Run-native-cd_idt8-cd_create_profile.patch \
24 file://08a32b2379fb5582f4312e59bf51a2823df56276.patch \
21" 25"
22 26
23EXTRA_OEMESON = " \ 27EXTRA_OEMESON += " \
24 -Dman=false \ 28 -Dman=false \
25 -Ddocs=false \ 29 -Ddaemon_user=colord \
30 -Dpnp_ids=${datadir}/hwdata/pnp.ids \
26" 31"
27 32
28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 33PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}"
@@ -42,4 +47,5 @@ FILES:${PN} += " \
42" 47"
43 48
44USERADD_PACKAGES = "${PN}" 49USERADD_PACKAGES = "${PN}"
45USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" 50USERADD_PARAM:${PN} = "--system --user-group -s /bin/false colord"
51
diff --git a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
index a120b73114..a120b73114 100644
--- a/meta-oe/recipes-support/colord/colord-native/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
+++ b/meta-oe/recipes-support/colord/colord/0001-Move-the-function-cd_icc_create_from_edid-to-avoid-u.patch
diff --git a/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch
new file mode 100644
index 0000000000..860e6ab4af
--- /dev/null
+++ b/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch
@@ -0,0 +1,28 @@
1From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001
2From: Richard Hughes <richard@hughsie.com>
3Date: Mon, 29 Jan 2024 10:37:11 +0000
4Subject: [PATCH] Fix writing to the database with ProtectSystem=strict
5
6Fixes https://github.com/hughsie/colord/issues/166
7
8Upstream-Status: Backport [https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276]
9Signed-off-by: Markus Volk <f_l_k@t-online.de>
10---
11 data/colord.service.in | 4 ++++
12 1 file changed, 4 insertions(+)
13
14diff --git a/data/colord.service.in b/data/colord.service.in
15index 6825d944..c358dc4b 100644
16--- a/data/colord.service.in
17+++ b/data/colord.service.in
18@@ -17,6 +17,10 @@ ProtectControlGroups=true
19 RestrictRealtime=true
20 RestrictAddressFamilies=AF_UNIX
21
22+ConfigurationDirectory=colord
23+StateDirectory=colord
24+CacheDirectory=colord
25+
26 # drop all capabilities
27 CapabilityBoundingSet=~CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_SYS_ADMIN CAP_SYS_PTRACE CAP_CHOWN CAP_FSETID CAP_SETFCAP CAP_DAC_OVERRIDE CAP_DAC_READ_SEARCH CAP_FOWNER CAP_IPC_OWNER CAP_NET_ADMIN CAP_SYS_RAWIO CAP_SYS_TIME CAP_AUDIT_CONTROL CAP_AUDIT_READ CAP_AUDIT_WRITE CAP_KILL CAP_MKNOD CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SYS_NICE CAP_SYS_RESOURCE CAP_MAC_ADMIN CAP_MAC_OVERRIDE CAP_SYS_BOOT CAP_LINUX_IMMUTABLE CAP_IPC_LOCK CAP_SYS_CHROOT CAP_BLOCK_SUSPEND CAP_LEASE CAP_SYS_PACCT CAP_SYS_TTY_CONFIG CAP_WAKE_ALARM
28
diff --git a/meta-oe/recipes-support/colord/colord-native/Makefile b/meta-oe/recipes-support/colord/colord/Makefile
index 1e29e4f670..1e29e4f670 100644
--- a/meta-oe/recipes-support/colord/colord-native/Makefile
+++ b/meta-oe/recipes-support/colord/colord/Makefile
diff --git a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
index aaf33b40ec..f2bae91f44 100644
--- a/meta-oe/recipes-support/composefs/composefs_1.0.4.bb
+++ b/meta-oe/recipes-support/composefs/composefs_1.0.8.bb
@@ -3,31 +3,27 @@ DESCRIPTION = "The composefs project combines several underlying Linux \
3features to provide a very flexible mechanism to support read-only mountable \ 3features to provide a very flexible mechanism to support read-only mountable \
4filesystem trees, stacking on top of an underlying "lower" Linux filesystem." 4filesystem trees, stacking on top of an underlying "lower" Linux filesystem."
5HOMEPAGE = "https://github.com/containers/composefs" 5HOMEPAGE = "https://github.com/containers/composefs"
6LICENSE = "GPL-3.0-or-later & LGPL-2.0-or-later & Apache-2.0" 6LICENSE = "GPL-2.0-only & GPL-2.0-or-later & LGPL-2.1-or-later & Apache-2.0"
7LIC_FILES_CHKSUM = "\ 7LIC_FILES_CHKSUM = "\
8 file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \ 8 file://BSD-2-Clause.txt;md5=121c8a0a8fa5961a26b7863034ebcce8 \
9 file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ 9 file://COPYING;md5=5cbca48090f7fe0169186a551a5bf78c \
10 file://COPYING.LESSERv3;md5=6a6a8e020838b23406c81b19c1d46df6 \ 10 file://COPYING.GPL-2.0-only;md5=94fa01670a2a8f2d3ab2de15004e0848 \
11 file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ 11 file://COPYING.GPL-2.0-or-later;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
12 file://COPYINGv3;md5=d32239bcb673463ab874e80d47fae504 \ 12 file://COPYING.LGPL-2.1-or-later;md5=4fbd65380cdd255951079008b364516c \
13 file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ 13 file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \
14" 14"
15 15
16PV .= "+git${SRCPV}" 16SRCREV = "858ce1b38e1534c2602eb431124b5dca706bc746"
17SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5"
18SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" 17SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main"
19 18
20S = "${WORKDIR}/git"
21 19
22inherit autotools pkgconfig 20inherit meson
23 21
24DEPENDS = "openssl" 22DEPENDS = "openssl"
25 23
26EXTRA_OECONF += " \ 24EXTRA_OEMESON += " \
27 --disable-man \ 25 -Dman=disabled \
28 --without-fuse \ 26 -Dfuse=disabled \
29" 27"
30 28
31LDFLAGS:append:class-native = " -pthread"
32
33BBCLASSEXTEND = "native" 29BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
index 17981b6e9b..a1523be376 100644
--- a/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
+++ b/meta-oe/recipes-support/consolation/consolation_0.0.9.bb
@@ -17,7 +17,6 @@ DEPENDS = " \
17SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master" 17SRC_URI = "git://salsa.debian.org/consolation-team/consolation.git;branch=master"
18SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676" 18SRCREV = "5ef08f0cd6ede62de14de477b74fc3611108c676"
19 19
20S = "${WORKDIR}/git"
21 20
22inherit autotools pkgconfig systemd 21inherit autotools pkgconfig systemd
23 22
diff --git a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
index bda5177fc4..4b8bf162fa 100644
--- a/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
+++ b/meta-oe/recipes-support/cpp-netlib/cpp-netlib_git.bb
@@ -16,7 +16,6 @@ SRC_URI = "\
16 file://a53f123040998744602f190944464af0e159ea19.patch \ 16 file://a53f123040998744602f190944464af0e159ea19.patch \
17" 17"
18 18
19S = "${WORKDIR}/git"
20 19
21inherit cmake pkgconfig 20inherit cmake pkgconfig
22 21
@@ -28,3 +27,5 @@ do_install:append() {
28 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake 27 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibConfig.cmake
29 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake 28 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/cmake/cppnetlib/cppnetlibTargets-noconfig.cmake
30} 29}
30
31SKIP_RECIPE[cpp-netlib] ?= "Does not work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
index aec7286404..ec7be4ad37 100644
--- a/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
+++ b/meta-oe/recipes-support/cpprest/cpprest_2.10.19.bb
@@ -12,8 +12,9 @@ SRC_URI = "git://github.com/Microsoft/cpprestsdk.git;protocol=https;branch=maste
12 file://disable-outside-tests.patch " 12 file://disable-outside-tests.patch "
13 13
14# tag 2.10.19 14# tag 2.10.19
15SRCREV= "411a109150b270f23c8c97fa4ec9a0a4a98cdecf" 15SRCREV = "411a109150b270f23c8c97fa4ec9a0a4a98cdecf"
16 16
17S = "${WORKDIR}/git"
18 17
19inherit cmake pkgconfig 18inherit cmake pkgconfig
19
20SKIP_RECIPE[cpprest] ?= "Needs websocketpp which does not yet work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch b/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch
new file mode 100644
index 0000000000..c75cbe1950
--- /dev/null
+++ b/meta-oe/recipes-support/cpulimit/cpulimit/0002-busy.c-Fix-incompatible-pointer-type-error.patch
@@ -0,0 +1,51 @@
1From 86b71c49a373f78920d78c0e88f530f476b4fe70 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Wed, 26 Mar 2025 15:57:54 +0900
4Subject: [PATCH] busy.c: Fix incompatible pointer type error.
5
6Error occurs in gcc 15.0.1 environment.
7busy.c: In function 'main':
8busy.c:20:58: error: passing argument 3 of 'pthread_create' from incompatible pointer type [-Wincompatible-pointer-types]
9 20 | if ((ret = pthread_create(&thread, NULL, loop, NULL)) != 0)
10 | ^~~~
11 | |
12 | void * (*)(void)
13In file included from busy.c:3:
14recipe-sysroot/usr/include/pthread.h:204:36: note: expected 'void * (*)(void *)' but argument is of type 'void * (*)(void)'
15 204 | void *(*__start_routine) (void *),
16 | ~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~
17busy.c:6:7: note: 'loop' declared here
18 6 | void *loop()
19 | ^~~~
20
21Set loop parameter to void* since it requires void* type argument.
22
23Signed-off-by: mark.yang <mark.yang@lge.com>
24
25Upstream-Status: Inactive-Upstream [lastcommit: 9 Years ago and lastrelease: 9 Years ago]
26---
27 tests/busy.c | 4 ++--
28 1 file changed, 2 insertions(+), 2 deletions(-)
29
30diff --git a/tests/busy.c b/tests/busy.c
31index b3afb7c..2d726eb 100644
32--- a/tests/busy.c
33+++ b/tests/busy.c
34@@ -3,7 +3,7 @@
35 #include <pthread.h>
36 #include <unistd.h>
37
38-void *loop()
39+void *loop(void *arg)
40 {
41 while(1);
42 }
43@@ -23,7 +23,7 @@ int main(int argc, char **argv) {
44 exit(1);
45 }
46 }
47- loop();
48+ loop(NULL);
49 return 0;
50 }
51 \ No newline at end of file
diff --git a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
index f88d3b6ca1..676028efa1 100644
--- a/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
+++ b/meta-oe/recipes-support/cpulimit/cpulimit_0.2.bb
@@ -7,9 +7,9 @@ SRCREV ?= "f4d2682804931e7aea02a869137344bb5452a3cd"
7 7
8SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \ 8SRC_URI = "git://github.com/opsengine/cpulimit.git;protocol=https;branch=master \
9 file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \ 9 file://0001-Remove-sys-sysctl.h-and-add-missing-libgen.h-include.patch \
10 file://0002-busy.c-Fix-incompatible-pointer-type-error.patch \
10 " 11 "
11 12
12S = "${WORKDIR}/git"
13 13
14do_compile() { 14do_compile() {
15 oe_runmake all 15 oe_runmake all
diff --git a/meta-oe/recipes-support/crucible/crucible-go-mods.inc b/meta-oe/recipes-support/crucible/crucible-go-mods.inc
new file mode 100644
index 0000000000..0123d8c966
--- /dev/null
+++ b/meta-oe/recipes-support/crucible/crucible-go-mods.inc
@@ -0,0 +1,155 @@
1SRC_URI += "\
2 gomod://cloud.google.com/go;version=v0.111.0;sha256sum=f17610c7b09a9582375daa59ec73761b0bd7ad313075710ebfb1c8f4fd63776a \
3 gomod://cloud.google.com/go;version=v0.26.0;mod=1;sha256sum=2218a34f20b971bc195216d4195f57520a2acbd85de7fc31acfc440266704c11 \
4 gomod://cloud.google.com/go/compute;version=v1.23.3;sha256sum=9214cf85837ea8b96bd61e56e297f06d3008b9d1fc81841e79aaad2940f3ed56 \
5 gomod://cloud.google.com/go/compute/metadata;version=v0.2.3;sha256sum=292864dbd0b1de37a968e285e949885e573384837d81cd3695be5ce2e2391887 \
6 gomod://cloud.google.com/go/iam;version=v1.1.5;sha256sum=7d218318eef5255587d6db35f2aa9952125881c640f6e04fe76d521c14d5d7f3 \
7 gomod://cloud.google.com/go/kms;version=v1.15.6;sha256sum=75e7a21b453cad66aae756e3d0c42a7550c299d62832a0361d6ea6396b4074a9 \
8 gomod://cloud.google.com/go/longrunning;version=v0.5.4;sha256sum=a3eb14ee47bfdbca7df05c0011bcd9a86997ae8ef0a12c3a44a340c7e9ce2c0f \
9 gomod://cloud.google.com/go/security;version=v1.15.5;sha256sum=f4dd23e113cad47462715d654c95de55c1c890b37cca8c79b47bb5a7c0ec9417 \
10 gomod://github.com/BurntSushi/toml;version=v0.3.1;mod=1;sha256sum=28021b4180a59c3993607a95b18e230dd0bc6bea5242ffe8ea8bbfb4f4f7b4d7 \
11 gomod://github.com/census-instrumentation/opencensus-proto;version=v0.2.1;mod=1;sha256sum=dae64639296402235b55587d14d2640615eb3736fa840e4327d3c15db63cc345 \
12 gomod://github.com/client9/misspell;version=v0.3.4;mod=1;sha256sum=d1bc362dddd96fb3a43ed4b92aaab70aa6c7ef5a500d7f09564e3eb24abcf0b8 \
13 gomod://github.com/cncf/udpa/go;version=v0.0.0-20191209042840-269d4d468f6f;mod=1;sha256sum=05f5d4a77a84be45dedc80ebac5a38ef2fd1c6ff3faedad9c00eb31231181218 \
14 gomod://github.com/davecgh/go-spew;version=v1.1.0;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
15 gomod://github.com/davecgh/go-spew;version=v1.1.1;mod=1;sha256sum=bcb29393251237b79a17b6c19bf29134f43e8f438c3198988fcd461a1cdf05cc \
16 gomod://github.com/envoyproxy/go-control-plane;version=v0.9.0;mod=1;sha256sum=2e0f3c5940c6930bce03f0c8cd1724dd93d4d30c6b1c5ae2ee4e3039f0215c07 \
17 gomod://github.com/envoyproxy/go-control-plane;version=v0.9.1-0.20191026205805-5f8ba28d4473;mod=1;sha256sum=2e0f3c5940c6930bce03f0c8cd1724dd93d4d30c6b1c5ae2ee4e3039f0215c07 \
18 gomod://github.com/envoyproxy/go-control-plane;version=v0.9.4;mod=1;sha256sum=6309f752f7d45b74c97e3f8e0e54fc47e604d965b528e60fa68a46317ecb44dc \
19 gomod://github.com/envoyproxy/protoc-gen-validate;version=v0.1.0;mod=1;sha256sum=c8e2e1bf931ad31ab4a5a32673eff764398fbf9cbc6c31bbf005c7c904fc69aa \
20 gomod://github.com/felixge/httpsnoop;version=v1.0.4;sha256sum=75aa471311265e9860df0e523400b4650ed0c1a33262786a421f07226792e494 \
21 gomod://github.com/ghodss/yaml;version=v1.0.0;sha256sum=c3f295d23c02c0b35e4d3b29053586e737cf9642df9615da99c0bda9bbacc624 \
22 gomod://github.com/go-logr/logr;version=v1.2.2;mod=1;sha256sum=519b1d6da5eeef675b4a1857d628f05f110a2b8cb3c423b715fea80d0975a518 \
23 gomod://github.com/go-logr/logr;version=v1.4.1;sha256sum=27d1c8d411fd8e42dc6202991d70afa630089700f1d002de5454d6c26f93674c \
24 gomod://github.com/go-logr/stdr;version=v1.2.2;sha256sum=9dd6893bf700198485ae699640b49bc1efbc6c73b37cb5792a0476e1fd8f7fef \
25 gomod://github.com/golang/glog;version=v0.0.0-20160126235308-23def4e6c14b;mod=1;sha256sum=9c9bafc0f52905afaa7164858b3a01a0cc3dc07da23030177ce487f727438958 \
26 gomod://github.com/golang/groupcache;version=v0.0.0-20200121045136-8c9f03a8e57e;mod=1;sha256sum=5117e2bb86f1cc7cc7489f9f2580fa17b2ef1e3a0a346bf64ed8063ca7b87663 \
27 gomod://github.com/golang/groupcache;version=v0.0.0-20210331224755-41bb18bfe9da;sha256sum=b27034e8fc013627543e1ad098cfc65329f2896df3da5cf3266cc9166f93f3a5 \
28 gomod://github.com/golang/mock;version=v1.1.1;mod=1;sha256sum=5c47c4f981ac63d37f1308647a20d75a148eb2a8f9cc0e7531f030afd0b229e0 \
29 gomod://github.com/golang/protobuf;version=v1.2.0;mod=1;sha256sum=c0a2031bf277087749d8ccc432449f6b1375787eac8641dd2f930074231aafb4 \
30 gomod://github.com/golang/protobuf;version=v1.3.2;mod=1;sha256sum=c0a2031bf277087749d8ccc432449f6b1375787eac8641dd2f930074231aafb4 \
31 gomod://github.com/golang/protobuf;version=v1.4.0;mod=1;sha256sum=0d092f7aa2877feb9e55aee2668286ebbf7e3d0711b1702d84c9225e4cca73f8 \
32 gomod://github.com/golang/protobuf;version=v1.4.0-rc.1;mod=1;sha256sum=eb386ed18bb8d6092974524bd0cda610ad87bee1a4485c9f01bccb713e7dab1e \
33 gomod://github.com/golang/protobuf;version=v1.4.0-rc.1.0.20200221234624-67d41d38c208;mod=1;sha256sum=78c95913aee9dfebd1e84f8b862e98bb1848d1d3e9f22aaf909c4ef4f7e7293d \
34 gomod://github.com/golang/protobuf;version=v1.4.0-rc.2;mod=1;sha256sum=e2622048b96cd87173bd9aeb801a1010807a412e89529509e9a5099f1fc69ab4 \
35 gomod://github.com/golang/protobuf;version=v1.4.0-rc.4.0.20200313231945-b860323f09d0;mod=1;sha256sum=1edf9512236391b88764083bde0391fc49864738432acfdcdd3229572dc71be1 \
36 gomod://github.com/golang/protobuf;version=v1.4.1;mod=1;sha256sum=b7ebbef0f2166a73c7ab79ec37a01b25206b6327e684e3898ba7cb75ecd6ec00 \
37 gomod://github.com/golang/protobuf;version=v1.4.3;mod=1;sha256sum=4bf5885d1ebdc6d270958379a741cd3b4f7aca016e874d8e8b1059110dfe9e15 \
38 gomod://github.com/golang/protobuf;version=v1.5.0;mod=1;sha256sum=738cbb1de96b67a6238ac3b8081cd8b1bfb0daebcf6c9bbe8cbdb6d73baecd19 \
39 gomod://github.com/golang/protobuf;version=v1.5.2;mod=1;sha256sum=7c8e7610527afd7724c7e8b7e843f132b0db61e8c9dd49dc589d430e8929bcc4 \
40 gomod://github.com/golang/protobuf;version=v1.5.3;sha256sum=93bda6e88d4a0a493a98b481de67a10000a755d15f16a800b49a6b96d1bd6f81 \
41 gomod://github.com/google/go-cmp;version=v0.2.0;mod=1;sha256sum=9c2736ea2c03fb1d94b2a1d496aa1a51726c764f158b9f6cde1d7465fc90f412 \
42 gomod://github.com/google/go-cmp;version=v0.3.0;mod=1;sha256sum=81df7917c225a9da7604b230d952fa278c60a8832c10d799385d134b05d5b087 \
43 gomod://github.com/google/go-cmp;version=v0.3.1;mod=1;sha256sum=81df7917c225a9da7604b230d952fa278c60a8832c10d799385d134b05d5b087 \
44 gomod://github.com/google/go-cmp;version=v0.4.0;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
45 gomod://github.com/google/go-cmp;version=v0.5.0;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
46 gomod://github.com/google/go-cmp;version=v0.5.3;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
47 gomod://github.com/google/go-cmp;version=v0.5.5;mod=1;sha256sum=4036ab5636aa42bd313296cd3bfcb4c88912760c56a9e6655ae422d8767c80da \
48 gomod://github.com/google/s2a-go;version=v0.1.7;sha256sum=4392e675b6f0ff0b90f970c0280d63e34b32d077e1f8c0abd1006ad0dbeb2f2e \
49 gomod://github.com/google/uuid;version=v1.1.2;mod=1;sha256sum=73da47b6338b00a082fd451aa35a3273d3adc09b8e9bba98dab01091e402af6e \
50 gomod://github.com/googleapis/enterprise-certificate-proxy;version=v0.3.2;sha256sum=56127cb8bea94f438c4e867f9217bdfc55865282953e54c74eee019575c1020e \
51 gomod://github.com/googleapis/gax-go/v2;version=v2.12.0;sha256sum=10ad5944b8bcce3f2cb9a215a0dda163de5b1f092e61b74a4e162d1eb8f7f7a2 \
52 gomod://github.com/pmezard/go-difflib;version=v1.0.0;mod=1;sha256sum=74b2e766eb215377864d587badf57e95521f692d2a7860b3c7759093f9c9bec2 \
53 gomod://github.com/prometheus/client_model;version=v0.0.0-20190812154241-14fe0d1b01d4;mod=1;sha256sum=8ae247f8b1ced742fbc4aa7ebc6b6c935172eaafa61a2be52ba0bd41286db031 \
54 gomod://github.com/smallstep/pkcs7;version=v0.0.0-20231107075624-be1870d87d13;sha256sum=7f8ed17d46a7dbc883d64b95718a1f6b7ec3bac4b5984741523701d20723ad14 \
55 gomod://github.com/stretchr/objx;version=v0.1.0;mod=1;sha256sum=1350354d52d2287a62336ecc0d56232d4c47699af9bba49c67c2b48254da98f1 \
56 gomod://github.com/stretchr/objx;version=v0.4.0;mod=1;sha256sum=31b2fdcdee870f0f61bffafafb96220967e5bca08a76a920d574216fc1f91355 \
57 gomod://github.com/stretchr/objx;version=v0.5.0;mod=1;sha256sum=cb326540efcb1274a6e4e970d7fc9de2e8062f08a058fc296d859025e62e807a \
58 gomod://github.com/stretchr/testify;version=v1.7.1;mod=1;sha256sum=fff8168d98e6a07156c454a1b6e925509f3177e96c155516d7f96b4079cca3bf \
59 gomod://github.com/stretchr/testify;version=v1.8.0;mod=1;sha256sum=e076074c1560ad1dda98b8b00fea6308c4b6ccd06ddd088d22db4626ed68f738 \
60 gomod://github.com/stretchr/testify;version=v1.8.1;mod=1;sha256sum=af1a5dcb331ace7a3f9fc1b5d7eee9c0bc82b4a2a182fe4cec2add217e2853d6 \
61 gomod://github.com/usbarmory/tamago;version=v0.0.0-20221201111136-9bb9b42304fa;mod=1;sha256sum=3735262e8a80c900b992a499da1076db95d5ecab3fd5237152e4e78fb28db944 \
62 gomod://github.com/yuin/goldmark;version=v1.4.13;mod=1;sha256sum=ee7fe4466203a01d3ac19adc134cdec99bc6de71992c28f3dd9a74480bff0603 \
63 gomod://go.opencensus.io;version=v0.24.0;sha256sum=203a767d7f8e7c1ebe5588220ad168d1e15b14ae70a636de7ca9a4a88a7e0d0c \
64 gomod://go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc;version=v0.47.0;sha256sum=efb13c3eb89199b0f677057a238017b06ffceb868ac55f4f649a31309ec0321d \
65 gomod://go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp;version=v0.47.0;sha256sum=476b9113a426e31a3802d8371c348ae3334c56acba9fc7228b886096c64647a1 \
66 gomod://go.opentelemetry.io/otel;version=v1.22.0;sha256sum=6c02668caef05c8221cf2fb43f4f2943de701f3c4fb69096f2f7da523f1c80d2 \
67 gomod://go.opentelemetry.io/otel/metric;version=v1.22.0;sha256sum=deb750b41631365dbda60fb872dc6901f16817e0b2646307fbfeb4eeb391e02f \
68 gomod://go.opentelemetry.io/otel/trace;version=v1.22.0;sha256sum=d63e40f32d614b00bedfa945eae95e2bc5fe867e167cd7dbfe7f90d96fa599d7 \
69 gomod://golang.org/x/crypto;version=v0.0.0-20190308221718-c2843e01d9a2;mod=1;sha256sum=33ed070a5a66e0960685ac5386440e1b59899e74d8a38a1180685e72a2195ded \
70 gomod://golang.org/x/crypto;version=v0.0.0-20200622213623-75b288015ac9;mod=1;sha256sum=b2b12d09f81915fbcf4226009e50f9efda8bd3757d2055d8ec07977e65bc6618 \
71 gomod://golang.org/x/crypto;version=v0.0.0-20210921155107-089bfa567519;mod=1;sha256sum=cd6311612a2aa4d0d7e03c41b3aa1fbc2d5f895ab3f61089fab80bfe9f8f5485 \
72 gomod://golang.org/x/crypto;version=v0.18.0;sha256sum=5413479720bbf5183144652805203a3df74800d2f281f611e82d3a7ec15f4325 \
73 gomod://golang.org/x/exp;version=v0.0.0-20190121172915-509febef88a4;mod=1;sha256sum=9ff1d07ca8c09458450eb5f4076aa0390ef5c7db0c7a942150e88258a78b5383 \
74 gomod://golang.org/x/lint;version=v0.0.0-20181026193005-c67002cb31c3;mod=1;sha256sum=169b05225c8e2729727e0679ae3911918dfe1c4b18bed5ee0fae29f9ed77b207 \
75 gomod://golang.org/x/lint;version=v0.0.0-20190227174305-5b3e6a55c961;mod=1;sha256sum=8e86b5869db58a7659e485b07dbce3beb1170a153631579e50f4cbf544bb1342 \
76 gomod://golang.org/x/lint;version=v0.0.0-20190313153728-d0100b6bd8b3;mod=1;sha256sum=79df4350b922a8d193782e5600f88280a2b9d41781bfb3760c09bf52ad3023bf \
77 gomod://golang.org/x/mod;version=v0.6.0-dev.0.20220419223038-86c51ed26bb4;mod=1;sha256sum=42d19023ff8f2eae700bc5495f371ecd998a22d19ba985d0af5f69900b254083 \
78 gomod://golang.org/x/net;version=v0.0.0-20180724234803-3673e40ba225;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
79 gomod://golang.org/x/net;version=v0.0.0-20180826012351-8a410e7b638d;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
80 gomod://golang.org/x/net;version=v0.0.0-20190213061140-3a22650c66bd;mod=1;sha256sum=3e08f487ddda1851b891df5b1d04bb1a01b84d6d702aa82d9efbccde0aa7df81 \
81 gomod://golang.org/x/net;version=v0.0.0-20190311183353-d8887717615a;mod=1;sha256sum=f7046769daac02beb57cbcc481280df59fb403c96fe8262282aba858c7f7fa4d \
82 gomod://golang.org/x/net;version=v0.0.0-20190404232315-eb5bcb51f2a3;mod=1;sha256sum=f7046769daac02beb57cbcc481280df59fb403c96fe8262282aba858c7f7fa4d \
83 gomod://golang.org/x/net;version=v0.0.0-20190620200207-3b0461eec859;mod=1;sha256sum=e6efdaf78a29503f080cf6d2615e289cfb1d9e3ab7d570f53668eca2b4ab41da \
84 gomod://golang.org/x/net;version=v0.0.0-20201110031124-69a78807bb2b;mod=1;sha256sum=66fc44a0644a506da780f7a22a5d73dd025d44a6e58740b62d27f74d7c3a4948 \
85 gomod://golang.org/x/net;version=v0.0.0-20210226172049-e18ecbb05110;mod=1;sha256sum=fef5896d103a0bce5055fdb5e96e830944334792437865347718edceb633348a \
86 gomod://golang.org/x/net;version=v0.0.0-20220722155237-a158d28d115b;mod=1;sha256sum=b315c52647d2da2f76e5cdb9d367e1d6727784236a9bffb612192b19b10a128d \
87 gomod://golang.org/x/net;version=v0.20.0;sha256sum=00adca2fa3315d397ecb886989998f03fefda7b81a0b5ebb3586acef273e0f29 \
88 gomod://golang.org/x/oauth2;version=v0.0.0-20180821212333-d2e6202438be;mod=1;sha256sum=cbbb618da87d4f943b54bfd4f4d3a2fff3610298f04fbeeb3db388cb075f351a \
89 gomod://golang.org/x/oauth2;version=v0.16.0;sha256sum=a6597a80e0461877b21bf5bda71423bfdc9e8701128e39c71ec3aa7e190c7ac3 \
90 gomod://golang.org/x/sync;version=v0.0.0-20180314180146-1d60e4601c6f;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
91 gomod://golang.org/x/sync;version=v0.0.0-20181108010431-42b317875d0f;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
92 gomod://golang.org/x/sync;version=v0.0.0-20190423024810-112230192c58;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
93 gomod://golang.org/x/sync;version=v0.0.0-20220722155255-886fb9371eb4;mod=1;sha256sum=421f6139686d5891f3dc5a563d0995780d3279f65cad4d225cea52686794161c \
94 gomod://golang.org/x/sync;version=v0.6.0;sha256sum=7c75175297a3b368b806bd24c7401629df11dcc655e3c14470058282f101ca6a \
95 gomod://golang.org/x/sys;version=v0.0.0-20180830151530-49385e6e1522;mod=1;sha256sum=8969115e4a39108848324e79a1bd8a8445230e6e3aaccbe9f8057fb50fffc8c1 \
96 gomod://golang.org/x/sys;version=v0.0.0-20190215142949-d0b11bdaac8a;mod=1;sha256sum=8969115e4a39108848324e79a1bd8a8445230e6e3aaccbe9f8057fb50fffc8c1 \
97 gomod://golang.org/x/sys;version=v0.0.0-20190412213103-97732733099d;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
98 gomod://golang.org/x/sys;version=v0.0.0-20200930185726-fdedc70b468f;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
99 gomod://golang.org/x/sys;version=v0.0.0-20201119102817-f84b799fce68;mod=1;sha256sum=181979e8bd57d2d9e064182da86c9a6111aa69755e888f08431ece4742aec343 \
100 gomod://golang.org/x/sys;version=v0.0.0-20210615035016-665e8c7367d1;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
101 gomod://golang.org/x/sys;version=v0.0.0-20220520151302-bc2c85ada10a;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
102 gomod://golang.org/x/sys;version=v0.0.0-20220722155257-8c9f86f7a55f;mod=1;sha256sum=f033333096fe198f3151deed93f2deba74e50bbfe7739134045bc3b7ce4a5024 \
103 gomod://golang.org/x/sys;version=v0.16.0;sha256sum=0175809134fc12e040ea427e927036692127f2891b72e224e5153da543af604a \
104 gomod://golang.org/x/term;version=v0.0.0-20201126162022-7de9c90e9dd1;mod=1;sha256sum=4cbab14f7706771b271d995a1b3cc131fe5a246aadc7ee6d1ba6f0bd894781fa \
105 gomod://golang.org/x/term;version=v0.0.0-20210927222741-03fcf44c2211;mod=1;sha256sum=740794e2914f5cc87e25656c5843222b2c65665821205f45632a0477c8d3f79b \
106 gomod://golang.org/x/text;version=v0.14.0;sha256sum=b9814897e0e09cd576a7a013f066c7db537a3d538d2e0f60f0caee9bc1b3f4af \
107 gomod://golang.org/x/text;version=v0.3.0;mod=1;sha256sum=36879d586fd8001e84da8787190a11e4f78749e2a81dfe8b9b6931899fff31cf \
108 gomod://golang.org/x/text;version=v0.3.3;mod=1;sha256sum=fbb7a88ed140515e790eca7a10ffd319c9786b11c6a6c7e59f80f7fb37bb4542 \
109 gomod://golang.org/x/text;version=v0.3.7;mod=1;sha256sum=c45d669089427bc4635d07b185f9b9680332d1c48c75b3c49cb715b81a04a5b0 \
110 gomod://golang.org/x/text;version=v0.3.8;mod=1;sha256sum=0c06e8d4bc0c4eddce0f9ca01ad87dd9ff74cad7fa8ba166fe97d97d1deb27ae \
111 gomod://golang.org/x/time;version=v0.5.0;sha256sum=e0e5812d19aed367f79ac0ae0ce4770b6602c85f5cfb8d59f3f573c7487ea516 \
112 gomod://golang.org/x/tools;version=v0.0.0-20180917221912-90fa682c2a6e;mod=1;sha256sum=a0e02f0678fe62dc3c4b4bc77fa912c9b70de10fa9f7cf2f7aad0337392b52af \
113 gomod://golang.org/x/tools;version=v0.0.0-20190114222345-bf090417da8b;mod=1;sha256sum=a0e02f0678fe62dc3c4b4bc77fa912c9b70de10fa9f7cf2f7aad0337392b52af \
114 gomod://golang.org/x/tools;version=v0.0.0-20190226205152-f727befe758c;mod=1;sha256sum=2503823869125550d3f88bdef72820024fe27b141f44b81fc3b4f59ef78370eb \
115 gomod://golang.org/x/tools;version=v0.0.0-20190311212946-11955173bddd;mod=1;sha256sum=029638674bdf4fce7437ebc25cda0c8172674ec534b1d2edeb0b474c7d618f00 \
116 gomod://golang.org/x/tools;version=v0.0.0-20190524140312-2c0ae7006135;mod=1;sha256sum=135189df02315d75d62e27551d1accad1db5bd3c1a2a8756f63a69f73b1b5217 \
117 gomod://golang.org/x/tools;version=v0.0.0-20191119224855-298f0cb1881e;mod=1;sha256sum=88d479265f886f5e598d76c003d0f257b42dbf1b895d820a12b5ab0b3501aca1 \
118 gomod://golang.org/x/tools;version=v0.1.12;mod=1;sha256sum=2a8b9365898f0822face65ba089a1353e68a65d342f300ca317cceccde6421f3 \
119 gomod://golang.org/x/xerrors;version=v0.0.0-20190717185122-a985d3407aa7;mod=1;sha256sum=aa5e3ec9bb7b9f681609efac019d9de1a7ba7719248ff1eaa27e78882db3d7f5 \
120 gomod://golang.org/x/xerrors;version=v0.0.0-20191204190536-9bdfabe68543;mod=1;sha256sum=aa5e3ec9bb7b9f681609efac019d9de1a7ba7719248ff1eaa27e78882db3d7f5 \
121 gomod://google.golang.org/api;version=v0.160.0;sha256sum=3130cdcb9e9ab27b9ee8d2b0b3427b25e948ca2eb5000ab6c8ecea6411396b5c \
122 gomod://google.golang.org/appengine;version=v1.1.0;mod=1;sha256sum=d0fb3f328a95259ddeeb7ef934f2abae0327c6a052ff1ab05a2b882178a953b8 \
123 gomod://google.golang.org/appengine;version=v1.4.0;mod=1;sha256sum=f95b808fed2c6febb23a8d11e92743583b37861584d302349ada5ae02a3874dd \
124 gomod://google.golang.org/appengine;version=v1.6.8;mod=1;sha256sum=ef17709123a95906e09d1318b71489fd455bd6efbf6d404083b3137256df2423 \
125 gomod://google.golang.org/genproto;version=v0.0.0-20180817151627-c66870c02cf8;mod=1;sha256sum=4379a64312660353b2dadb20fd55d9968674bbc2bbcf09d50c0aba80111a64b2 \
126 gomod://google.golang.org/genproto;version=v0.0.0-20190819201941-24fa4b261c55;mod=1;sha256sum=4b8edb9554439c665a29e584eda81870cbb699092227d97ba8fa9641538d541d \
127 gomod://google.golang.org/genproto;version=v0.0.0-20200526211855-cb27e3aa2013;mod=1;sha256sum=4ec394d3eca73687d111a3e0e88808b100687302b463b17869bcd026016748bd \
128 gomod://google.golang.org/genproto;version=v0.0.0-20240116215550-a9fa1716bcac;sha256sum=e65fb3abc11c20b0910c40a3b269b79b06c2cdd6e7efab29a5ea50f18a62b7f9 \
129 gomod://google.golang.org/genproto/googleapis/api;version=v0.0.0-20240125205218-1f4bbc51befe;sha256sum=742068cead896163dbe16785d7e56c45d31335d478ea6d10f9188507531bcb52 \
130 gomod://google.golang.org/genproto/googleapis/rpc;version=v0.0.0-20240116215550-a9fa1716bcac;sha256sum=6a1f0ec363ac60b2c41801d1f303306f7a6768ec0ba8efe5b4e9257ff4a91ad5 \
131 gomod://google.golang.org/grpc;version=v1.19.0;mod=1;sha256sum=71de2597fd082e882ef08965ba0c3ee19d38f2df25920733cd434cf80a27ac35 \
132 gomod://google.golang.org/grpc;version=v1.23.0;mod=1;sha256sum=587c9b854d7f5f0181487c854a24fc4c01982e5641d302ce1d0f3d041951cb8b \
133 gomod://google.golang.org/grpc;version=v1.25.1;mod=1;sha256sum=3c4690179945744ec5b01279df99be86153fd386d6fa6b8ef9888ace428cb182 \
134 gomod://google.golang.org/grpc;version=v1.27.0;mod=1;sha256sum=8ad8b97a2a43c2c76572c43a01c469a6e8ec3b049e739a8d3353c9c2ee4cd3d6 \
135 gomod://google.golang.org/grpc;version=v1.33.2;mod=1;sha256sum=74c09c930b5587527ec7bedb25986cce9589e76f0676096abad1a03565b3cff2 \
136 gomod://google.golang.org/grpc;version=v1.61.0;sha256sum=6971b322a68f83ae2055391e5bd57dfb359e67509961a75229b825d2bd15564d \
137 gomod://google.golang.org/protobuf;version=v0.0.0-20200109180630-ec00e32a8dfd;mod=1;sha256sum=a23990efb67ee10bb16d1d1936109cefa4e4262ae3da8d0748efb691614dbb78 \
138 gomod://google.golang.org/protobuf;version=v0.0.0-20200221191635-4d8936d0db64;mod=1;sha256sum=a6d950dd2a7eb82e51cf459d3f61f614b09d730adb9e8094d5bf96b043f38174 \
139 gomod://google.golang.org/protobuf;version=v0.0.0-20200228230310-ab0ca4ff8a60;mod=1;sha256sum=3b808d19947fb29e4db24ed5cb88941afc1927f538d80ad6f880ae4664a5d016 \
140 gomod://google.golang.org/protobuf;version=v1.20.1-0.20200309200217-e05f789c0967;mod=1;sha256sum=420ec9fba7793b96dff1c5ae9983656e72e1c0bd1d14dda2398aec1b294780ff \
141 gomod://google.golang.org/protobuf;version=v1.21.0;mod=1;sha256sum=a532d488ff1097b330ff2e2929f39ecff8c2fa09dc7650b66ca5430c2d8303fb \
142 gomod://google.golang.org/protobuf;version=v1.22.0;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
143 gomod://google.golang.org/protobuf;version=v1.23.0;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
144 gomod://google.golang.org/protobuf;version=v1.23.1-0.20200526195155-81db48ad09cc;mod=1;sha256sum=394a49462cbf6dca4dd86f3cf0e8ddcbb9adc9397f73e82fecae54c79e9e4d53 \
145 gomod://google.golang.org/protobuf;version=v1.25.0;mod=1;sha256sum=6dea80873d2758a81de6d16bcf6a7f45a27f2ad4c047b7b4da1e88481a974903 \
146 gomod://google.golang.org/protobuf;version=v1.26.0;mod=1;sha256sum=08ec2e20f38efcb651462800069ece4891e252a261007fa9d5a1b157f516ee5f \
147 gomod://google.golang.org/protobuf;version=v1.26.0-rc.1;mod=1;sha256sum=b2c4fe1a66ff5be6eb7c0c5388f080d08821c327ac5cf975dee51d8b0fb49e9f \
148 gomod://google.golang.org/protobuf;version=v1.32.0;sha256sum=c2c117cf29abee8697dabdc69662accf66171bea0efa2749988867ae8ef2362d \
149 gomod://gopkg.in/check.v1;version=v0.0.0-20161208181325-20d25e280405;mod=1;sha256sum=5c306e0d633cd66a11b40e2e5fbbc6da42110db7d72ea3c1524ceb45ee40c33f \
150 gomod://gopkg.in/yaml.v2;version=v2.4.0;sha256sum=ede49e27c4cca6cdd2ec719aed8ea4d363710cceb3d411e7a786fbdec0d391fd \
151 gomod://gopkg.in/yaml.v3;version=v3.0.0-20200313102051-9f266ea9e77c;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
152 gomod://gopkg.in/yaml.v3;version=v3.0.1;mod=1;sha256sum=21579860a20306fcf43b1bd234d1fba319499c77611b71c05f9bf3ba90dab939 \
153 gomod://honnef.co/go/tools;version=v0.0.0-20190102054323-c2f93a96b099;mod=1;sha256sum=b1c60837ea61335f14df64f3194c3cd92e0f628f6064806718950f0d7a1dbe9e \
154 gomod://honnef.co/go/tools;version=v0.0.0-20190523083050-ea95bdfd59fc;mod=1;sha256sum=b1c60837ea61335f14df64f3194c3cd92e0f628f6064806718950f0d7a1dbe9e \
155"
diff --git a/meta-oe/recipes-support/crucible/crucible-licenses.inc b/meta-oe/recipes-support/crucible/crucible-licenses.inc
new file mode 100644
index 0000000000..bba9dbfc86
--- /dev/null
+++ b/meta-oe/recipes-support/crucible/crucible-licenses.inc
@@ -0,0 +1,40 @@
1GO_MOD_LICENSES = "Apache-2.0 & BSD-3-Clause & MIT"
2
3LIC_FILES_CHKSUM += "\
4 file://pkg/mod/cloud.google.com/go/compute/metadata@v0.2.3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
5 file://pkg/mod/cloud.google.com/go/iam@v1.1.5/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
6 file://pkg/mod/cloud.google.com/go/kms@v1.15.6/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
7 file://pkg/mod/cloud.google.com/go/longrunning@v0.5.4/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8 file://pkg/mod/cloud.google.com/go/security@v1.15.5/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9 file://pkg/mod/github.com/felixge/httpsnoop@v1.0.4/LICENSE.txt;md5=684da2bf3eed8fc8860e75ad84638225 \
10 file://pkg/mod/github.com/ghodss/yaml@v1.0.0/LICENSE;md5=0ceb9ff3b27d3a8cf451ca3785d73c71 \
11 file://pkg/mod/github.com/go-logr/logr@v1.4.1/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
12 file://pkg/mod/github.com/go-logr/stdr@v1.2.2/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
13 file://pkg/mod/github.com/golang/groupcache@v0.0.0-20210331224755-41bb18bfe9da/LICENSE;md5=19cbd64715b51267a47bf3750cc6a8a5 \
14 file://pkg/mod/github.com/golang/protobuf@v1.5.3/LICENSE;md5=939cce1ec101726fa754e698ac871622 \
15 file://pkg/mod/github.com/google/s2a-go@v0.1.7/LICENSE.md;md5=3b83ef96387f14655fc854ddc3c6bd57 \
16 file://pkg/mod/github.com/googleapis/enterprise-certificate-proxy@v0.3.2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
17 file://pkg/mod/github.com/googleapis/gax-go/v2@v2.12.0/LICENSE;md5=0dd48ae8103725bd7b401261520cdfbb \
18 file://pkg/mod/github.com/smallstep/pkcs7@v0.0.0-20231107075624-be1870d87d13/LICENSE;md5=a9b2952d51b44eae97b6090117f60792 \
19 file://pkg/mod/go.opencensus.io@v0.24.0/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \
20 file://pkg/mod/go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc@v0.47.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
21 file://pkg/mod/go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp@v0.47.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
22 file://pkg/mod/go.opentelemetry.io/otel/metric@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
23 file://pkg/mod/go.opentelemetry.io/otel/trace@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
24 file://pkg/mod/go.opentelemetry.io/otel@v1.22.0/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
25 file://pkg/mod/golang.org/x/crypto@v0.18.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
26 file://pkg/mod/golang.org/x/net@v0.20.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
27 file://pkg/mod/golang.org/x/oauth2@v0.16.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
28 file://pkg/mod/golang.org/x/sync@v0.6.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
29 file://pkg/mod/golang.org/x/sys@v0.16.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
30 file://pkg/mod/golang.org/x/text@v0.14.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
31 file://pkg/mod/golang.org/x/time@v0.5.0/LICENSE;md5=5d4950ecb7b26d2c5e4e7b4e0dd74707 \
32 file://pkg/mod/google.golang.org/api@v0.160.0/LICENSE;md5=a651bb3d8b1c412632e28823bb432b40 \
33 file://pkg/mod/google.golang.org/api@v0.160.0/internal/third_party/uritemplates/LICENSE;md5=4ee4feb2b545c2231749e5c54ace343e \
34 file://pkg/mod/google.golang.org/genproto/googleapis/api@v0.0.0-20240125205218-1f4bbc51befe/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
35 file://pkg/mod/google.golang.org/genproto/googleapis/rpc@v0.0.0-20240116215550-a9fa1716bcac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
36 file://pkg/mod/google.golang.org/genproto@v0.0.0-20240116215550-a9fa1716bcac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
37 file://pkg/mod/google.golang.org/grpc@v1.61.0/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
38 file://pkg/mod/google.golang.org/protobuf@v1.32.0/LICENSE;md5=02d4002e9171d41a8fad93aa7faf3956 \
39 file://pkg/mod/gopkg.in/yaml.v2@v2.4.0/LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e \
40"
diff --git a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
index 4247263b5a..132395e023 100644
--- a/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
+++ b/meta-oe/recipes-support/crucible/crucible_2023.11.02.bb
@@ -1,20 +1,19 @@
1SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses" 1SUMMARY = "Utility that provides userspace support for reading and writing to the i.MX fuses"
2LICENSE = "BSD-3-Clause" 2
3LICENSE = "BSD-3-Clause & ${GO_MOD_LICENSES}"
3LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116" 4LIC_FILES_CHKSUM = "file://src/${GO_IMPORT}/LICENSE;md5=201414b6610203caed355323b1ab3116"
5require ${BPN}-licenses.inc
4 6
5GO_IMPORT = "github.com/usbarmory/crucible"
6SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}" 7SRC_URI = "git://${GO_IMPORT}.git;protocol=https;branch=master;destsuffix=${GO_SRCURI_DESTSUFFIX}"
8require ${BPN}-go-mods.inc
9
10SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5"
7 11
12
13GO_IMPORT = "github.com/usbarmory/crucible"
8GO_INSTALL = "\ 14GO_INSTALL = "\
9 ${GO_IMPORT}/cmd/crucible \ 15 ${GO_IMPORT}/cmd/crucible \
10 ${GO_IMPORT}/cmd/habtool \ 16 ${GO_IMPORT}/cmd/habtool \
11" 17"
12SRCREV = "dec27cd4e0e0db106c0a21d429c04ca8d36bbdd5"
13
14export GOPROXY = "https://proxy.golang.org,direct"
15# Workaround for network access issue during compile step.
16# This needs to be fixed in the recipes buildsystem so that
17# it can be accomplished during do_fetch task.
18do_compile[network] = "1"
19 18
20inherit go-mod 19inherit go-mod
diff --git a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
index ece30a598b..04362db7e5 100644
--- a/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
+++ b/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb
@@ -8,8 +8,7 @@ SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/
8 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" 8 https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README"
9SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" 9SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91"
10 10
11S = "${WORKDIR}/sources" 11S = "${UNPACKDIR}"
12UNPACKDIR = "${S}"
13 12
14do_compile() { 13do_compile() {
15 install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE 14 install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE
diff --git a/meta-oe/recipes-support/ctre/ctre_3.9.0.bb b/meta-oe/recipes-support/ctre/ctre_3.9.0.bb
new file mode 100644
index 0000000000..901763f0ad
--- /dev/null
+++ b/meta-oe/recipes-support/ctre/ctre_3.9.0.bb
@@ -0,0 +1,21 @@
1DESCRIPTION = "Fast compile-time regular expressions with support for matching/searching/capturing."
2HOMEPAGE = "https://github.com/hanickadot/compile-time-regular-expressions"
3
4LICENSE = "Apache-2.0"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=2e982d844baa4df1c80de75470e0c5cb"
6
7SRC_URI = "git://github.com/hanickadot/compile-time-regular-expressions.git;protocol=https;branch=main"
8SRCREV = "eb9577aae3515d14e6c5564f9aeb046d2e7c1124"
9
10
11inherit cmake
12
13PACKAGECONFIG ??= ""
14PACKAGECONFIG[module] = "-DCTRE_MODULE=ON,-DCTRE_MODULE=OFF"
15PACKAGECONFIG[tests] = "-DCTRE_BUILD_TESTS=ON,-DCTRE_BUILD_TESTS=OFF"
16
17EXTRA_OECMAKE:append = " \
18-DCTRE_BUILD_PACKAGE=OFF \
19-DCTRE_BUILD_PACKAGE_DEB=OFF \
20-DCTRE_BUILD_PACKAGE_RPM=OFF \
21"
diff --git a/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb b/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb
new file mode 100644
index 0000000000..7b0cc05979
--- /dev/null
+++ b/meta-oe/recipes-support/cxxopts/cxxopts_3.3.1.bb
@@ -0,0 +1,19 @@
1DESCRIPTION = "A header-only lightweight C++ command line option parser."
2HOMEPAGE = "https://github.com/jarro2783/cxxopts"
3
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=8de00431559a76a1b43f6fd44f8f6689"
6
7SRC_URI = "git://github.com/jarro2783/cxxopts.git;protocol=https;branch=master"
8SRCREV = "44380e5a44706ab7347f400698c703eb2a196202"
9
10
11inherit cmake
12
13EXTRA_OECMAKE:append = " \
14-DCXXOPTS_BUILD_EXAMPLES=OFF \
15-DCXXOPTS_BUILD_TESTS=OFF \
16-DCXXOPTS_ENABLE_INSTALL=ON \
17-DCXXOPTS_ENABLE_WARNINGS=OFF \
18-DCXXOPTS_USE_UNICODE_HELP=OFF \
19"
diff --git a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
index f63348a328..5f33c27c52 100644
--- a/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
+++ b/meta-oe/recipes-support/cyaml/cyaml_1.4.1.bb
@@ -11,7 +11,6 @@ SRCREV = "07ff8654a270ec9b410acd3152b60de9e9f941af"
11 11
12SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main" 12SRC_URI = "git://github.com/tlsa/libcyaml.git;protocol=https;branch=main"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit pkgconfig 15inherit pkgconfig
17 16
diff --git a/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch b/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch
new file mode 100644
index 0000000000..3a79dba682
--- /dev/null
+++ b/meta-oe/recipes-support/daemonize/daemonize/0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch
@@ -0,0 +1,46 @@
1From c47fdcc0a900aea93b1967c20db42743171ab1ac Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Thu, 27 Mar 2025 16:46:42 +0900
4Subject: [PATCH] fix getopt.c too many arguments to function 'write' error in
5 gcc-15.0.1
6
7In the original code, write() was declared as 'extern int write();',
8which is interpreted as a function taking no parameters.
9This caused errors when actually calling it with 3 parameters.
10The current fix to declare it as 'extern int write(int, const void *, unsigned);'
11is the correct solution.
12This properly defines the write function to accept 3 parameters.
13
14../git/getopt.c: In function 'x_getopt':
15../git/getopt.c:51:16: error: too many arguments to function 'write'; expected 0, have 3
16 51 | (void) write(2, argv[0], (unsigned)strlen(argv[0]));\
17 | ^~~~~ ~
18../git/getopt.c:78:17: note: in expansion of macro 'ERR'
19 78 | ERR(": illegal option -- ", c);
20 | ^~~
21../git/getopt.c:48:20: note: declared here
22 48 | extern int write();\
23 | ^~~~~
24
25Upstream-Status: Submitted [https://github.com/bmc/daemonize/pull/37]
26Signed-off-by: mark.yang <mark.yang@lge.com>
27---
28 getopt.c | 2 +-
29 1 file changed, 1 insertion(+), 1 deletion(-)
30
31diff --git a/getopt.c b/getopt.c
32index 3f37c55..f298da7 100644
33--- a/getopt.c
34+++ b/getopt.c
35@@ -45,7 +45,7 @@
36 #include <string.h>
37
38 #define ERR(s, c) if(x_opterr){\
39- extern int write();\
40+ extern int write(int, const void *, unsigned);\
41 char errbuf[2];\
42 errbuf[0] = c; errbuf[1] = '\n';\
43 (void) write(2, argv[0], (unsigned)strlen(argv[0]));\
44--
452.34.1
46
diff --git a/meta-oe/recipes-support/daemonize/daemonize_git.bb b/meta-oe/recipes-support/daemonize/daemonize_git.bb
index f46dec59fc..bae04ca7a3 100644
--- a/meta-oe/recipes-support/daemonize/daemonize_git.bb
+++ b/meta-oe/recipes-support/daemonize/daemonize_git.bb
@@ -7,9 +7,10 @@ PV = "1.7.8"
7inherit autotools 7inherit autotools
8 8
9SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c" 9SRCREV = "18869a797dab12bf1c917ba3b4782fef484c407c"
10SRC_URI = "git://github.com/bmc/daemonize.git;branch=master;protocol=https \ 10SRC_URI = " \
11 git://github.com/bmc/daemonize.git;branch=master;protocol=https \
12 file://0001-fix-getopt.c-too-many-arguments-to-function-write-er.patch \
11" 13"
12 14
13S = "${WORKDIR}/git"
14 15
15EXTRA_AUTORECONF += "--exclude=autoheader" 16EXTRA_AUTORECONF += "--exclude=autoheader"
diff --git a/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch
new file mode 100644
index 0000000000..8910b40ec5
--- /dev/null
+++ b/meta-oe/recipes-support/daemontools/daemontools/0001-fix-prototype-declaration-with-gcc-15.patch
@@ -0,0 +1,252 @@
1From d4e8b6638ede51dee635317baf86a43d40bc45d2 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Tue, 8 Apr 2025 14:02:04 +0900
4Subject: [PATCH] fix prototype declaration with gcc 15
5
6* Fix prototype declaration and too many arguments function errors due to outdated style
7byte_chr.c:9:1: error: number of arguments doesn't match prototype
8 9 | {
9 | ^
10In file included from byte_chr.c:3:
11byte.h:6:21: error: prototype declaration
12 6 | extern unsigned int byte_chr();
13 | ^~~~~~~~
14...
15./compile buffer_get.c
16buffer_get.c: In function 'oneread':
17buffer_get.c:12:9: error: too many arguments to function 'op'; expected 0, have 3
18 12 | r = op(fd,buf,len);
19 | ^~ ~~
20...
21supervise.c: In function 'doit':
22supervise.c:144:11: error: too many arguments to function 'wait_nohang'; expected 0, have 1
23 144 | r = wait_nohang(&wstat);
24 | ^~~~~~~~~~~ ~~~~~~
25
26Upstream-Status: Inactive-Upstream [lastrelease: 10 years ago]
27Signed-off-by: mark.yang <mark.yang@lge.com>
28---
29 src/alloc.c | 6 ++----
30 src/alloc.h | 6 +++---
31 src/alloc_re.c | 5 +----
32 src/buffer_get.c | 2 +-
33 src/buffer_put.c | 2 +-
34 src/byte.h | 10 +++++-----
35 src/byte_chr.c | 5 +----
36 src/byte_copy.c | 5 +----
37 src/byte_cr.c | 5 +----
38 src/byte_diff.c | 5 +----
39 src/byte_rchr.c | 5 +----
40 src/select.h2 | 1 -
41 src/wait.h | 4 ++--
42 13 files changed, 20 insertions(+), 41 deletions(-)
43
44diff --git a/src/alloc.c b/src/alloc.c
45index c741aa4..5b21993 100644
46--- a/src/alloc.c
47+++ b/src/alloc.c
48@@ -12,8 +12,7 @@ static aligned realspace[SPACE / ALIGNMENT];
49 #define space ((char *) realspace)
50 static unsigned int avail = SPACE; /* multiple of ALIGNMENT; 0<=avail<=SPACE */
51
52-/*@null@*//*@out@*/char *alloc(n)
53-unsigned int n;
54+/*@null@*//*@out@*/char *alloc(unsigned int n)
55 {
56 char *x;
57 n = ALIGNMENT + n - (n & (ALIGNMENT - 1)); /* XXX: could overflow */
58@@ -23,8 +22,7 @@ unsigned int n;
59 return x;
60 }
61
62-void alloc_free(x)
63-char *x;
64+void alloc_free(char *x)
65 {
66 if (x >= space)
67 if (x < space + SPACE)
68diff --git a/src/alloc.h b/src/alloc.h
69index 21122fc..7a13178 100644
70--- a/src/alloc.h
71+++ b/src/alloc.h
72@@ -3,8 +3,8 @@
73 #ifndef ALLOC_H
74 #define ALLOC_H
75
76-extern /*@null@*//*@out@*/char *alloc();
77-extern void alloc_free();
78-extern int alloc_re();
79+extern /*@null@*//*@out@*/char *alloc(unsigned int n);
80+extern void alloc_free(char *x);
81+extern int alloc_re(char **x,unsigned int m,unsigned int n);
82
83 #endif
84diff --git a/src/alloc_re.c b/src/alloc_re.c
85index 1074609..5096fb1 100644
86--- a/src/alloc_re.c
87+++ b/src/alloc_re.c
88@@ -3,10 +3,7 @@
89 #include "alloc.h"
90 #include "byte.h"
91
92-int alloc_re(x,m,n)
93-char **x;
94-unsigned int m;
95-unsigned int n;
96+int alloc_re(char **x,unsigned int m,unsigned int n)
97 {
98 char *y;
99
100diff --git a/src/buffer_get.c b/src/buffer_get.c
101index 3a6e1b6..2a38fa1 100644
102--- a/src/buffer_get.c
103+++ b/src/buffer_get.c
104@@ -4,7 +4,7 @@
105 #include "byte.h"
106 #include "error.h"
107
108-static int oneread(int (*op)(),int fd,char *buf,unsigned int len)
109+static int oneread(int (*op)(int, char *, unsigned int),int fd,char *buf,unsigned int len)
110 {
111 int r;
112
113diff --git a/src/buffer_put.c b/src/buffer_put.c
114index 23164b3..23d1d2b 100644
115--- a/src/buffer_put.c
116+++ b/src/buffer_put.c
117@@ -5,7 +5,7 @@
118 #include "byte.h"
119 #include "error.h"
120
121-static int allwrite(int (*op)(),int fd,const char *buf,unsigned int len)
122+static int allwrite(int (*op)(int, const char *, unsigned int),int fd,const char *buf,unsigned int len)
123 {
124 int w;
125
126diff --git a/src/byte.h b/src/byte.h
127index 09aab61..d5ccf83 100644
128--- a/src/byte.h
129+++ b/src/byte.h
130@@ -3,11 +3,11 @@
131 #ifndef BYTE_H
132 #define BYTE_H
133
134-extern unsigned int byte_chr();
135-extern unsigned int byte_rchr();
136-extern void byte_copy();
137-extern void byte_copyr();
138-extern int byte_diff();
139+extern unsigned int byte_chr(char* s,register unsigned int n,int c);
140+extern unsigned int byte_rchr(char* s,register unsigned int n,int c);
141+extern void byte_copy(register char* to,register unsigned int n,register char* from);
142+extern void byte_copyr(register char* to,register unsigned int n,register char* from);
143+extern int byte_diff(register char* s,register unsigned int n,register char* t);
144 extern void byte_zero();
145
146 #define byte_equal(s,n,t) (!byte_diff((s),(n),(t)))
147diff --git a/src/byte_chr.c b/src/byte_chr.c
148index fd56056..7fbcd61 100644
149--- a/src/byte_chr.c
150+++ b/src/byte_chr.c
151@@ -2,10 +2,7 @@
152
153 #include "byte.h"
154
155-unsigned int byte_chr(s,n,c)
156-char *s;
157-register unsigned int n;
158-int c;
159+unsigned int byte_chr(char* s,register unsigned int n,int c)
160 {
161 register char ch;
162 register char *t;
163diff --git a/src/byte_copy.c b/src/byte_copy.c
164index 74c9e4a..917d795 100644
165--- a/src/byte_copy.c
166+++ b/src/byte_copy.c
167@@ -2,10 +2,7 @@
168
169 #include "byte.h"
170
171-void byte_copy(to,n,from)
172-register char *to;
173-register unsigned int n;
174-register char *from;
175+void byte_copy(register char* to,register unsigned int n,register char* from)
176 {
177 for (;;) {
178 if (!n) return; *to++ = *from++; --n;
179diff --git a/src/byte_cr.c b/src/byte_cr.c
180index 52dc251..ac3ec67 100644
181--- a/src/byte_cr.c
182+++ b/src/byte_cr.c
183@@ -2,10 +2,7 @@
184
185 #include "byte.h"
186
187-void byte_copyr(to,n,from)
188-register char *to;
189-register unsigned int n;
190-register char *from;
191+void byte_copyr(register char* to,register unsigned int n,register char* from)
192 {
193 to += n;
194 from += n;
195diff --git a/src/byte_diff.c b/src/byte_diff.c
196index 0c4d17b..e1ef257 100644
197--- a/src/byte_diff.c
198+++ b/src/byte_diff.c
199@@ -2,10 +2,7 @@
200
201 #include "byte.h"
202
203-int byte_diff(s,n,t)
204-register char *s;
205-register unsigned int n;
206-register char *t;
207+int byte_diff(register char* s,register unsigned int n,register char* t)
208 {
209 for (;;) {
210 if (!n) return 0; if (*s != *t) break; ++s; ++t; --n;
211diff --git a/src/byte_rchr.c b/src/byte_rchr.c
212index 7ea9948..04391bf 100644
213--- a/src/byte_rchr.c
214+++ b/src/byte_rchr.c
215@@ -2,10 +2,7 @@
216
217 #include "byte.h"
218
219-unsigned int byte_rchr(s,n,c)
220-char *s;
221-register unsigned int n;
222-int c;
223+unsigned int byte_rchr(char* s,register unsigned int n,int c)
224 {
225 register char ch;
226 register char *t;
227diff --git a/src/select.h2 b/src/select.h2
228index 4bd4fcf..b7ac8c9 100644
229--- a/src/select.h2
230+++ b/src/select.h2
231@@ -8,6 +8,5 @@
232 #include <sys/types.h>
233 #include <sys/time.h>
234 #include <sys/select.h>
235-extern int select();
236
237 #endif
238diff --git a/src/wait.h b/src/wait.h
239index d294e9d..168d1bf 100644
240--- a/src/wait.h
241+++ b/src/wait.h
242@@ -3,8 +3,8 @@
243 #ifndef WAIT_H
244 #define WAIT_H
245
246-extern int wait_pid();
247-extern int wait_nohang();
248+extern int wait_pid(int* status, int pid);
249+extern int wait_nohang(int* status);
250 extern int wait_stop();
251 extern int wait_stopnohang();
252
diff --git a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
index a35b54e3bc..cc83015e65 100644
--- a/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
+++ b/meta-oe/recipes-support/daemontools/daemontools_0.76.bb
@@ -24,14 +24,22 @@ SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \
24 file://0001-daemontools-Fix-QA-Issue.patch \ 24 file://0001-daemontools-Fix-QA-Issue.patch \
25 file://warnings.patch \ 25 file://warnings.patch \
26 file://0001-Fix-signature-of-main-function.patch \ 26 file://0001-Fix-signature-of-main-function.patch \
27 file://0001-fix-prototype-declaration-with-gcc-15.patch \
27" 28"
28 29
29SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc"
30SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" 30SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f"
31 31
32S = "${WORKDIR}/admin/${BP}" 32UPSTREAM_CHECK_URI = "http://cr.yp.to/daemontools/install.html"
33 33
34S = "${UNPACKDIR}/admin/${BP}"
35
36# http://errors.yoctoproject.org/Errors/Details/766886/
37# pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
38# pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
39# pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
40# pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types]
34do_compile() { 41do_compile() {
42 export CC="$CC -Wno-error=incompatible-pointer-types"
35 ./package/compile 43 ./package/compile
36} 44}
37 45
diff --git a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb
index a8fd88a9ad..31330faa17 100644
--- a/meta-oe/recipes-support/dc/double-conversion_3.3.0.bb
+++ b/meta-oe/recipes-support/dc/double-conversion_3.3.1.bb
@@ -6,13 +6,12 @@ LICENSE = "BSD-3-Clause"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=1ea35644f0ec0d9767897115667e901f"
7 7
8 8
9S = "${WORKDIR}/git"
10 9
11SRC_URI = " \ 10SRC_URI = " \
12 git://github.com/google/double-conversion.git;protocol=https;branch=master \ 11 git://github.com/google/double-conversion.git;protocol=https;branch=master \
13 file://run-ptest \ 12 file://run-ptest \
14" 13"
15SRCREV = "4f7a25d8ced8c7cf6eee6fd09d6788eaa23c9afe" 14SRCREV = "ae0dbfeb9744efd216c95b30555049d75d47116a"
16 15
17inherit cmake ptest 16inherit cmake ptest
18 17
diff --git a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
index aee6bfe3da..e601755af4 100644
--- a/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
+++ b/meta-oe/recipes-support/devmem2/devmem2_2.0.bb
@@ -5,7 +5,9 @@ LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf9862
5SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" 5SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main"
6SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" 6SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e"
7 7
8S = "${WORKDIR}/git" 8# Upstream repo does not tag
9UPSTREAM_CHECK_COMMITS = "1"
10
9 11
10CFLAGS += "-DFORCE_STRICT_ALIGNMENT" 12CFLAGS += "-DFORCE_STRICT_ALIGNMENT"
11 13
diff --git a/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch b/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch
new file mode 100644
index 0000000000..b4d7656aff
--- /dev/null
+++ b/meta-oe/recipes-support/dhex/dhex/0001-Fix-function-declaration-conflict-error-with-empty-p.patch
@@ -0,0 +1,38 @@
1From 86491a25b9057576234d1eaf4da020413e7259ad Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Tue, 8 Apr 2025 14:43:29 +0900
4Subject: [PATCH] Fix function declaration conflict error with empty parameters
5 in gcc-15
6
7* A strict error handling for function parameters in gcc-15 causes errors.
8output.c:9:6: error: conflicting types for 'initcolors'; have 'void(tOutput *)' {aka 'void(struct _tOutput *)'}
9 9 | void initcolors(tOutput* output)
10 | ^~~~~~~~~~
11In file included from output.c:7:
12output.h:10:6: note: previous declaration of 'initcolors' with type 'void(void)'
13 10 | void initcolors();
14 | ^~~~~~~~~~
15
16
17* This component is a personal project and is maintained through the maintainer's personal email.
18 I have sent the patch via email and am waiting for a response.
19
20Upstream-Status: Pending
21Signed-off-by: mark.yang <mark.yang@lge.com>
22---
23 output.h | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/output.h b/output.h
27index cef29e9..b2b5e38 100644
28--- a/output.h
29+++ b/output.h
30@@ -7,7 +7,7 @@
31 #include "machine_type.h"
32 #include "datatypes.h"
33
34-void initcolors();
35+void initcolors(tOutput* output);
36 void colorpair(tOutput* output,uicolors uicol,short fg,short bg,int attr);
37 void pairsinit(tOutput* output);
38 void setcolor(tOutput* output,uicolors col);
diff --git a/meta-oe/recipes-support/dhex/dhex_0.69.bb b/meta-oe/recipes-support/dhex/dhex_0.69.bb
index 3cc870481f..f292cf8d4f 100644
--- a/meta-oe/recipes-support/dhex/dhex_0.69.bb
+++ b/meta-oe/recipes-support/dhex/dhex_0.69.bb
@@ -7,11 +7,13 @@ DEPENDS = "ncurses"
7LICENSE = "GPL-2.0-or-later" 7LICENSE = "GPL-2.0-or-later"
8LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da" 8LIC_FILES_CHKSUM = "file://README.txt;beginline=229;endline=241;md5=6f252a421b65bcecf624382ba3c899da"
9 9
10SRC_URI = "http://www.dettus.net/dhex/dhex_0.69.tar.gz" 10SRC_URI = " \
11SRC_URI[md5sum] = "64d557437fe110c19f23ed3e9bbcdd54" 11 http://www.dettus.net/dhex/dhex_0.69.tar.gz \
12 file://0001-Fix-function-declaration-conflict-error-with-empty-p.patch \
13"
12SRC_URI[sha256sum] = "52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b" 14SRC_URI[sha256sum] = "52730bcd1cf16bd4dae0de42531be9a4057535ec61ca38c0804eb8246ea6c41b"
13 15
14S = "${WORKDIR}/dhex_${PV}" 16S = "${UNPACKDIR}/dhex_${PV}"
15 17
16EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'" 18EXTRA_OEMAKE += "'CC=${CC}' 'LDFLAGS=${LDFLAGS}' 'CPPFLAGS=${CPPFLAGS}'"
17 19
diff --git a/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
new file mode 100644
index 0000000000..484fc1c3a2
--- /dev/null
+++ b/meta-oe/recipes-support/digitemp/digitemp/0001-Fix-conflicting-prototype.patch
@@ -0,0 +1,32 @@
1From fa56b0f78d12f97ac44e0a367d413a9e88611d1c Mon Sep 17 00:00:00 2001
2From: Robert Scheck <robert-scheck@users.noreply.github.com>
3Date: Thu, 16 Jan 2025 21:24:41 +0100
4Subject: [PATCH] Fix conflicting prototype
5
6src/digitemp.c:171:6: error: conflicting types for ‘free_coupler’; have ‘void(int)’
7 171 | void free_coupler( int free_only )
8 | ^~~~~~~~~~~~
9In file included from src/digitemp.c:78:
10src/digitemp.h:90:6: note: previous declaration of ‘free_coupler’ with type ‘void(void)’
11 90 | void free_coupler();
12 | ^~~~~~~~~~~~
13
14Upstream-Status: Backport [https://github.com/bcl/digitemp/commit/fa56b0f78d12f97ac44e0a367d413a9e88611d1c]
15Signed-off-by: mark.yang <mark.yang@lge.com>
16---
17 src/digitemp.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/digitemp.h b/src/digitemp.h
21index 06d50e9..e81a7be 100644
22--- a/src/digitemp.h
23+++ b/src/digitemp.h
24@@ -87,7 +87,7 @@ struct _coupler {
25
26 /* Prototypes */
27 void usage();
28-void free_coupler();
29+void free_coupler( int free_only );
30 float c2f( float temp );
31 int build_tf( char *time_format, char *format, int sensor,
32 float temp_c, int humidity, unsigned char *sn );
diff --git a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
index 6565097334..baddf42e6b 100644
--- a/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
+++ b/meta-oe/recipes-support/digitemp/digitemp_3.7.2.bb
@@ -4,11 +4,13 @@ DEPENDS = "libusb1"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0" 5LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
6 6
7SRC_URI = "git://github.com/bcl/digitemp;branch=master;protocol=https" 7SRC_URI = " \
8 git://github.com/bcl/digitemp;branch=master;protocol=https \
9 file://0001-Fix-conflicting-prototype.patch \
10"
8 11
9SRCREV = "a162e63aad35358aab325388f3d5e88121606419" 12SRCREV = "a162e63aad35358aab325388f3d5e88121606419"
10 13
11S = "${WORKDIR}/git"
12 14
13EXTRA_OEMAKE = "ds9097 ds9097u \ 15EXTRA_OEMAKE = "ds9097 ds9097u \
14 SYSTYPE='Linux' \ 16 SYSTYPE='Linux' \
diff --git a/meta-oe/recipes-support/dool/dool_1.3.2.bb b/meta-oe/recipes-support/dool/dool_1.3.4.bb
index f7e403018c..d18f5c8b01 100644
--- a/meta-oe/recipes-support/dool/dool_1.3.2.bb
+++ b/meta-oe/recipes-support/dool/dool_1.3.4.bb
@@ -12,9 +12,8 @@ RDEPENDS:${PN} += "python3-core python3-misc python3-resource python3-shell pyth
12SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \ 12SRC_URI = "git://github.com/scottchiefbaker/dool.git;branch=master;protocol=https \
13 " 13 "
14 14
15SRCREV = "b2862905be841232c9e36ce1e059d3fe34ef0cdf" 15SRCREV = "5068abef0a960c173a91e84a45e7fea1b0a802c0"
16 16
17S = "${WORKDIR}/git"
18 17
19do_install() { 18do_install() {
20 oe_runmake 'DESTDIR=${D}' install 19 oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
index 970844f982..578a2b8d3b 100644
--- a/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
+++ b/meta-oe/recipes-support/driverctl/driverctl_0.115.bb
@@ -10,7 +10,6 @@ RDEPENDS:${PN} += "bash bash-completion"
10SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https" 10SRC_URI = "git://gitlab.com/driverctl/driverctl.git;branch=master;protocol=https"
11SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3" 11SRCREV = "2ba60536eb20ca0a6a751bd8b6501dba84ec45d3"
12 12
13S = "${WORKDIR}/git"
14 13
15inherit pkgconfig systemd features_check 14inherit pkgconfig systemd features_check
16 15
diff --git a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
index 6eaec800ca..fc8681ca44 100644
--- a/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
+++ b/meta-oe/recipes-support/edid-decode/edid-decode_git.bb
@@ -6,10 +6,13 @@ SECTION = "console/utils"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592"
8 8
9SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" 9SRC_URI = "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master"
10SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" 10SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5"
11PV = "0.0+git" 11PV = "0.0+git"
12S = "${WORKDIR}/git" 12
13# Upstream repo does not tag
14UPSTREAM_CHECK_COMMITS = "1"
15
13 16
14do_install() { 17do_install() {
15 oe_runmake 'DESTDIR=${D}' install 18 oe_runmake 'DESTDIR=${D}' install
diff --git a/meta-oe/recipes-support/eject/eject_2.1.5.bb b/meta-oe/recipes-support/eject/eject_2.1.5.bb
index dd5489e7db..aa0e86db12 100644
--- a/meta-oe/recipes-support/eject/eject_2.1.5.bb
+++ b/meta-oe/recipes-support/eject/eject_2.1.5.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
5 5
6inherit autotools gettext update-alternatives 6inherit autotools gettext update-alternatives
7 7
8SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \ 8SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/${BP}.tar.gz \
9 file://eject-2.1.5-error-return.patch \ 9 file://eject-2.1.5-error-return.patch \
10 file://eject-2.1.1-verbose.patch \ 10 file://eject-2.1.1-verbose.patch \
11 file://eject-2.1.5-spaces.patch \ 11 file://eject-2.1.5-spaces.patch \
@@ -13,10 +13,9 @@ SRC_URI = "http://sources.openembedded.org/${BP}.tar.gz \
13 file://0001-eject-Include-sys-sysmacros.h-for-major-minor.patch \ 13 file://0001-eject-Include-sys-sysmacros.h-for-major-minor.patch \
14 " 14 "
15 15
16SRC_URI[md5sum] = "b96a6d4263122f1711db12701d79f738"
17SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55" 16SRC_URI[sha256sum] = "ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55"
18 17
19S = "${WORKDIR}/${BPN}" 18S = "${UNPACKDIR}/${BPN}"
20 19
21 20
22do_compile:prepend() { 21do_compile:prepend() {
diff --git a/meta-oe/recipes-support/enca/enca/cross.patch b/meta-oe/recipes-support/enca/enca/cross.patch
new file mode 100644
index 0000000000..7749dee088
--- /dev/null
+++ b/meta-oe/recipes-support/enca/enca/cross.patch
@@ -0,0 +1,68 @@
1From: Helmut Grohne <helmut@subdivi.de>
2Subject: build make_hash with the build arch compiler
3
4Also note that we cannot include config.h in make_hash.c, because it is
5specific to the host architecture.
6
7Sourced from debian - https://salsa.debian.org/debian/enca/-/blob/master/debian/patches/cross.patch?ref_type=heads
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11
12Index: enca-1.19/configure.ac
13===================================================================
14--- enca-1.19.orig/configure.ac
15+++ enca-1.19/configure.ac
16@@ -35,6 +35,7 @@
17 dnl Checks for programs.
18 AC_PROG_AWK
19 AC_PROG_CC
20+AX_PROG_CC_FOR_BUILD
21 AC_GNU_SOURCE
22 AC_AIX
23 AC_ISC_POSIX
24Index: enca-1.19/tools/Makefile.am
25===================================================================
26--- enca-1.19.orig/tools/Makefile.am
27+++ enca-1.19/tools/Makefile.am
28@@ -2,7 +2,8 @@
29 noinst_HEADERS = encodings.h
30 noinst_SCRIPTS = expand_table.pl
31
32-make_hash_SOURCES = make_hash.c
33+make_hash$(EXEEXT): make_hash.c
34+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ $<
35
36 BUILT_SOURCES = $(noinst_HEADERS)
37
38Index: enca-1.19/tools/make_hash.c
39===================================================================
40--- enca-1.19.orig/tools/make_hash.c
41+++ enca-1.19/tools/make_hash.c
42@@ -17,25 +17,9 @@
43 with this program; if not, write to the Free Software Foundation, Inc.,
44 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
45 */
46-#ifdef HAVE_CONFIG_H
47-# include "config.h"
48-#endif /* HAVE_CONFIG_H */
49-
50 #include <stdlib.h>
51 #include <stdio.h>
52-
53-#ifdef HAVE_STRING_H
54-# include <string.h>
55-#else /* HAVE_STRING_H */
56-# ifdef HAVE_STRINGS_H
57-# include <strings.h>
58-# endif /* HAVE_STRINGS_H */
59-#endif /* HAVE_STRING_H */
60-
61-#ifdef HAVE_MEMORY_H
62-# include <memory.h>
63-#endif /* HAVE_MEMORY_H */
64-
65+#include <string.h>
66 #include <unistd.h>
67 #include <ctype.h>
68
diff --git a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch b/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
deleted file mode 100644
index 756745d839..0000000000
--- a/meta-oe/recipes-support/enca/enca/makefile-remove-tools.patch
+++ /dev/null
@@ -1,14 +0,0 @@
1Upstream-Status: Pending
2
3--- enca-1.19/Makefile.am.orig 2006-06-29 15:34:55.000000000 +0100
4+++ enca-1.19/Makefile.am 2006-06-29 15:35:20.000000000 +0100
5@@ -1,7 +1,7 @@
6 if MAINTAINER_MODE
7-SUBDIRS = tools data script lib src devel-docs test
8+SUBDIRS = data script lib src devel-docs test
9 else
10-SUBDIRS = tools script lib src devel-docs
11+SUBDIRS = script lib src devel-docs
12 endif
13 man_MANS = man/enca.1
14
diff --git a/meta-oe/recipes-support/enca/enca_1.19.bb b/meta-oe/recipes-support/enca/enca_1.19.bb
index 774f05f7c4..61da50ba52 100644
--- a/meta-oe/recipes-support/enca/enca_1.19.bb
+++ b/meta-oe/recipes-support/enca/enca_1.19.bb
@@ -2,33 +2,19 @@ SUMMARY = "Enca is an Extremely Naive Charset Analyser"
2SECTION = "libs" 2SECTION = "libs"
3HOMEPAGE = "https://cihar.com/software/enca/" 3HOMEPAGE = "https://cihar.com/software/enca/"
4 4
5DEPENDS += "gettext-native" 5DEPENDS += "gettext-native autoconf-archive-native"
6 6
7LICENSE = "GPL-2.0-only" 7LICENSE = "GPL-2.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4" 8LIC_FILES_CHKSUM = "file://COPYING;md5=24b9569831c46d4818450b55282476b4"
9 9
10SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \ 10SRC_URI = "https://dl.cihar.com/enca/enca-${PV}.tar.gz \
11 file://cross.patch \
11 file://dont-run-tests.patch \ 12 file://dont-run-tests.patch \
12 file://makefile-remove-tools.patch \
13 file://libenca-003-iconv.patch \ 13 file://libenca-003-iconv.patch \
14 file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch" 14 file://0001-Do-not-use-MKTEMP_PROG-in-cross-build.patch \
15 "
15SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a" 16SRC_URI[sha256sum] = "4c305cc59f3e57f2cfc150a6ac511690f43633595760e1cb266bf23362d72f8a"
16 17
17inherit autotools 18inherit autotools
18 19
19do_configure:prepend() { 20EXTRA_OECONF += "MKTEMP_PROG=mktemp"
20 # remove failing test which checks for something that isn't even used
21 sed -i -e '/ye_FUNC_SCANF_MODIF_SIZE_T/d' ${S}/configure.ac
22}
23
24do_configure:append() {
25 sed -i s:-I/usr/include::g ${B}/Makefile
26 sed -i s:-I/usr/include::g ${B}/*/Makefile
27}
28
29do_compile() {
30 cd ${S}/tools && ${BUILD_CC} -o make_hash make_hash.c
31 cd ${B}
32 oe_runmake
33}
34
diff --git a/meta-oe/recipes-support/epeg/epeg_git.bb b/meta-oe/recipes-support/epeg/epeg_git.bb
index e5277b1579..63c1455f25 100644
--- a/meta-oe/recipes-support/epeg/epeg_git.bb
+++ b/meta-oe/recipes-support/epeg/epeg_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/mattes/epeg.git;branch=master;protocol=https \
9 file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \ 9 file://0001-configure-Fix-checks-for-libjpeg-and-libexif.patch \
10 " 10 "
11SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047" 11SRCREV = "9a175cd67eaa61fe45413d8da82da72936567047"
12S = "${WORKDIR}/git"
13 12
14inherit autotools pkgconfig 13inherit autotools pkgconfig
15 14
diff --git a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
index 147a8069fa..c80bf12ade 100644
--- a/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
+++ b/meta-oe/recipes-support/espeak/espeak_1.48.04.bb
@@ -8,10 +8,9 @@ SRC_URI = "http://downloads.sourceforge.net/espeak/espeak-1.48.04-source.zip \
8 file://0002-tr_languages-cast-string_ordinal-init-values.patch \ 8 file://0002-tr_languages-cast-string_ordinal-init-values.patch \
9 file://0001-Drop-using-register-keyword-for-storage-classifier.patch \ 9 file://0001-Drop-using-register-keyword-for-storage-classifier.patch \
10" 10"
11SRC_URI[md5sum] = "cadd7482eaafe9239546bdc09fa244c3"
12SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659" 11SRC_URI[sha256sum] = "bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659"
13 12
14S = "${WORKDIR}/espeak-${PV}-source" 13S = "${UNPACKDIR}/espeak-${PV}-source"
15 14
16DEPENDS = "portaudio-v19 qemu-helper-native" 15DEPENDS = "portaudio-v19 qemu-helper-native"
17inherit siteinfo qemu 16inherit siteinfo qemu
diff --git a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
index 491f10dda0..225d15cc7f 100644
--- a/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
+++ b/meta-oe/recipes-support/evemu-tools/evemu-tools_git.bb
@@ -10,7 +10,6 @@ DEPENDS = "libevdev"
10SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4" 10SRCREV = "86a5627dbeac8d9d9bc34326a758d6a477e876e4"
11SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master" 11SRC_URI = "git://git@gitlab.freedesktop.org/libevdev/evemu.git;protocol=https;branch=master"
12 12
13S = "${WORKDIR}/git"
14PV = "2.7.0+git" 13PV = "2.7.0+git"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb
deleted file mode 100644
index 958810cf7a..0000000000
--- a/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools"
2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
4
5DEPENDS = "zlib expat brotli libinih"
6
7SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz"
8SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d"
9# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either
10# inherit dos2unix
11S = "${WORKDIR}/${BP}-Source"
12
13inherit cmake gettext
14
15do_install:append:class-target() {
16 # reproducibility: remove build host path
17 sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \
18 -e 's:${STAGING_DIR_HOST}::g'
19}
diff --git a/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb
new file mode 100644
index 0000000000..c0fb32ab79
--- /dev/null
+++ b/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb
@@ -0,0 +1,10 @@
1SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools"
2LICENSE = "GPL-2.0-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2"
4
5DEPENDS = "zlib expat brotli libinih"
6
7SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x"
8SRCREV = "a6a79ef064f131ffd03c110acce2d3edb84ffa2e"
9
10inherit cmake gettext
diff --git a/meta-oe/recipes-support/fbset/fbset-modes.bb b/meta-oe/recipes-support/fbset/fbset-modes.bb
index fcaf31795b..8ab79f6d7a 100644
--- a/meta-oe/recipes-support/fbset/fbset-modes.bb
+++ b/meta-oe/recipes-support/fbset/fbset-modes.bb
@@ -7,8 +7,7 @@ PV = "0.1.0"
7 7
8SRC_URI = "file://fb.modes" 8SRC_URI = "file://fb.modes"
9 9
10S = "${WORKDIR}/sources" 10S = "${UNPACKDIR}"
11UNPACKDIR = "${S}"
12 11
13do_install() { 12do_install() {
14 install -d ${D}${sysconfdir} 13 install -d ${D}${sysconfdir}
diff --git a/meta-oe/recipes-support/fbset/fbset_2.1.bb b/meta-oe/recipes-support/fbset/fbset_2.1.bb
index 690fee0df3..e6f357fd4f 100644
--- a/meta-oe/recipes-support/fbset/fbset_2.1.bb
+++ b/meta-oe/recipes-support/fbset/fbset_2.1.bb
@@ -33,5 +33,4 @@ ALTERNATIVE_LINK_NAME[fbset] = "${sbindir}/fbset"
33ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real" 33ALTERNATIVE_TARGET[fbset] = "${sbindir}/fbset.real"
34ALTERNATIVE_PRIORITY[fbset] = "55" 34ALTERNATIVE_PRIORITY[fbset] = "55"
35 35
36SRC_URI[md5sum] = "40ed9608f46d787bfb65fd1269f7f459"
37SRC_URI[sha256sum] = "517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338" 36SRC_URI[sha256sum] = "517fa062d7b2d367f931a1c6ebb2bef84907077f0ce3f0c899e34490bbea9338"
diff --git a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
index af7117da7b..52122b9c0c 100644
--- a/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
+++ b/meta-oe/recipes-support/fftw/fftw_3.3.10.bb
@@ -11,6 +11,8 @@ SRC_URI = " \
11" 11"
12SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" 12SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467"
13 13
14UPSTREAM_CHECK_URI = "http://www.fftw.org/download.html"
15
14inherit autotools pkgconfig ptest 16inherit autotools pkgconfig ptest
15 17
16# we had multiple recipes in the past 18# we had multiple recipes in the past
diff --git a/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-oe/recipes-support/fltk/fltk-native.bb
index 3e8e2cdf77..322a28430f 100644
--- a/meta-oe/recipes-support/fltk/fltk-native.bb
+++ b/meta-oe/recipes-support/fltk/fltk-native.bb
@@ -4,6 +4,8 @@ DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native"
4 4
5SRC_URI += "file://fltk-native-link-libdl.patch" 5SRC_URI += "file://fltk-native-link-libdl.patch"
6 6
7UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php"
8
7inherit native 9inherit native
8 10
9EXTRA_OECMAKE += " \ 11EXTRA_OECMAKE += " \
diff --git a/meta-oe/recipes-support/fltk/fltk.bb b/meta-oe/recipes-support/fltk/fltk.bb
index 82007c4cf4..4278a2fa3d 100644
--- a/meta-oe/recipes-support/fltk/fltk.bb
+++ b/meta-oe/recipes-support/fltk/fltk.bb
@@ -7,6 +7,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
7 7
8SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" 8SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch"
9 9
10UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php"
11
10EXTRA_OECMAKE = " \ 12EXTRA_OECMAKE = " \
11 -DOPTION_BUILD_SHARED_LIBS=ON \ 13 -DOPTION_BUILD_SHARED_LIBS=ON \
12 -DOPTION_USE_THREADS=ON \ 14 -DOPTION_USE_THREADS=ON \
diff --git a/meta-oe/recipes-support/fltk/fltk.inc b/meta-oe/recipes-support/fltk/fltk.inc
index b1bc83578f..0b2921095c 100644
--- a/meta-oe/recipes-support/fltk/fltk.inc
+++ b/meta-oe/recipes-support/fltk/fltk.inc
@@ -11,8 +11,8 @@ SRC_URI = " \
11 file://0002-always-build-fluid-and-export-pointers.patch \ 11 file://0002-always-build-fluid-and-export-pointers.patch \
12" 12"
13 13
14PV = "1.3.8" 14PV = "1.3.9"
15SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" 15SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2"
16 16
17inherit cmake pkgconfig 17inherit cmake pkgconfig
18 18
diff --git a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
index d1cbb35479..0d47dac2dd 100644
--- a/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
+++ b/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch
@@ -16,10 +16,10 @@ Content-Transfer-Encoding: 8bit
16| ^ 16| ^
17| src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed 17| src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed
18 18
19Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
20---
21Upstream-Status: Pending 19Upstream-Status: Pending
22 20
21Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
22---
23 src/Fl_Preferences.cxx | 2 +- 23 src/Fl_Preferences.cxx | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-) 24 1 file changed, 1 insertion(+), 1 deletion(-)
25 25
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
new file mode 100644
index 0000000000..ee27fe7906
--- /dev/null
+++ b/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-for-GCC15-C23-build-failure.patch
@@ -0,0 +1,42 @@
1From 5afe6492735938e0053ae78817399fa433f0f8c7 Mon Sep 17 00:00:00 2001
2From: "Pavel Cahyna" <pcahyna@redhat.com>
3Date: Tue, 8 Apr 2025 19:05:53 +0900
4Subject: [PATCH] Fix for GCC15 / C23 build failure
5
6* Import submitted patch from:
7 https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html
8
9 to fix:
10 http://errors.yoctoproject.org/Errors/Details/851185/
11 Error occurs with gcc version 15.
12 In gcc-15, C23 is the default and 'bool' is used as a reserved keyword.
13 https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
14
15Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2025-02/msg00000.html]
16Signed-off-by: mark.yang <mark.yang@lge.com>
17---
18 common/toolcommon/tool-config-file-common.c | 6 +++---
19 1 file changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/common/toolcommon/tool-config-file-common.c b/common/toolcommon/tool-config-file-common.c
22index 609e7a3..20dfad5 100644
23--- a/common/toolcommon/tool-config-file-common.c
24+++ b/common/toolcommon/tool-config-file-common.c
25@@ -78,14 +78,14 @@ _config_file_bool (conffile_t cf,
26 void *app_ptr,
27 int app_data)
28 {
29- int *bool;
30+ int *value;
31
32 assert (data);
33 assert (optionname);
34 assert (option_ptr);
35
36- bool = (int *)option_ptr;
37- *bool = data->boolval;
38+ value = (int *)option_ptr;
39+ *value = data->boolval;
40 return (0);
41 }
42
diff --git a/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
new file mode 100644
index 0000000000..e04ebfb0c6
--- /dev/null
+++ b/meta-oe/recipes-support/freeipmi/freeipmi_1.6.15.bb
@@ -0,0 +1,28 @@
1LICENSE = "GPL-3.0-only"
2LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \
3 file://COPYING.ZRESEARCH;md5=d32239bcb673463ab874e80d47fae504 \
4 file://COPYING.bmc-watchdog;md5=d32239bcb673463ab874e80d47fae504 \
5 file://COPYING.ipmi-dcmi;md5=d32239bcb673463ab874e80d47fae504 \
6 file://COPYING.ipmi-fru;md5=d32239bcb673463ab874e80d47fae504 \
7 file://COPYING.ipmiconsole;md5=d32239bcb673463ab874e80d47fae504 \
8 file://COPYING.ipmidetect;md5=d32239bcb673463ab874e80d47fae504 \
9 file://COPYING.ipmimonitoring;md5=d32239bcb673463ab874e80d47fae504 \
10 file://COPYING.ipmiping;md5=d32239bcb673463ab874e80d47fae504 \
11 file://COPYING.ipmipower;md5=d32239bcb673463ab874e80d47fae504 \
12 file://COPYING.ipmiseld;md5=d32239bcb673463ab874e80d47fae504 \
13 file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \
14 file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb"
15
16SRC_URI = " \
17 ${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \
18 file://0001-Fix-for-GCC15-C23-build-failure.patch \
19"
20SRC_URI[sha256sum] = "d6929c354639f5ce75b5b1897e8b366eb63625c23e5c4590a7aea034fe2b8caf"
21
22DEPENDS = "libgcrypt"
23DEPENDS:append:libc-musl = " argp-standalone"
24
25inherit pkgconfig autotools
26
27EXTRA_OECONF = "--without-random-device"
28
diff --git a/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch b/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch
new file mode 100644
index 0000000000..002135b5e4
--- /dev/null
+++ b/meta-oe/recipes-support/freerdp/freerdp/CVE-2024-32661.patch
@@ -0,0 +1,27 @@
1From 71e463e31b4d69f4022d36bfc814592f56600793 Mon Sep 17 00:00:00 2001
2From: akallabeth <akallabeth@posteo.net>
3Date: Sun, 21 Apr 2024 13:56:13 +0200
4Subject: [PATCH] [core,info] fix missing check in rdp_write_logon_info_v1
5
6CVE: CVE-2024-32661
7Upstream-Status: Backport [https://github.com/FreeRDP/FreeRDP/commit/71e463e31b4d69f4022d36bfc814592f56600793]
8Signed-off-by: Peter Marko <peter.marko@siemens.com>
9---
10 libfreerdp/core/info.c | 4 ++++
11 1 file changed, 4 insertions(+)
12
13diff --git a/libfreerdp/core/info.c b/libfreerdp/core/info.c
14index 7d6eec137..3395e4d2e 100644
15--- a/libfreerdp/core/info.c
16+++ b/libfreerdp/core/info.c
17@@ -1322,6 +1322,10 @@ static BOOL rdp_write_logon_info_v1(wStream* s, logon_info* info)
18 return FALSE;
19
20 /* domain */
21+ WINPR_ASSERT(info);
22+ if (!info->domain || !info->username)
23+ return FALSE;
24+
25 ilen = ConvertToUnicode(CP_UTF8, 0, info->domain, -1, &wString, 0);
26
27 if (ilen < 0)
diff --git a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
index b6974af739..284f61c137 100644
--- a/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp3_3.5.1.bb
@@ -10,7 +10,8 @@ inherit pkgconfig cmake
10SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf" 10SRCREV = "eda5c99686e15327f2f37b9cadf307e852b96adf"
11SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https" 11SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=master;protocol=https"
12 12
13S = "${WORKDIR}/git" 13
14CVE_PRODUCT = "freerdp"
14 15
15PACKAGECONFIG ??= " \ 16PACKAGECONFIG ??= " \
16 ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \ 17 ${@bb.utils.filter('DISTRO_FEATURES', 'pam pulseaudio wayland x11', d)} \
diff --git a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
index ee4d4530d6..18af3229d7 100644
--- a/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
+++ b/meta-oe/recipes-support/freerdp/freerdp_2.11.7.bb
@@ -3,7 +3,7 @@
3 3
4DESCRIPTION = "FreeRDP RDP client & server library" 4DESCRIPTION = "FreeRDP RDP client & server library"
5HOMEPAGE = "http://www.freerdp.com" 5HOMEPAGE = "http://www.freerdp.com"
6DEPENDS = "openssl alsa-lib libusb1" 6DEPENDS = "openssl libusb1"
7SECTION = "net" 7SECTION = "net"
8LICENSE = "Apache-2.0" 8LICENSE = "Apache-2.0"
9LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 9LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
@@ -20,12 +20,11 @@ SRC_URI = "git://github.com/FreeRDP/FreeRDP.git;branch=stable-2.0;protocol=https
20 file://0001-Fix-const-qualifier-error.patch \ 20 file://0001-Fix-const-qualifier-error.patch \
21 file://0002-Do-not-install-tools-a-CMake-targets.patch \ 21 file://0002-Do-not-install-tools-a-CMake-targets.patch \
22 file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \ 22 file://0001-Fixed-compilation-warnings-in-ainput-channel.patch \
23 file://CVE-2024-32661.patch \
23 " 24 "
24 25
25S = "${WORKDIR}/git"
26 26
27EXTRA_OECMAKE += " \ 27EXTRA_OECMAKE += " \
28 -DWITH_ALSA=ON \
29 -DWITH_FFMPEG=OFF \ 28 -DWITH_FFMPEG=OFF \
30 -DWITH_CUNIT=OFF \ 29 -DWITH_CUNIT=OFF \
31 -DWITH_NEON=OFF \ 30 -DWITH_NEON=OFF \
@@ -37,7 +36,7 @@ EXTRA_OECMAKE += " \
37 36
38PACKAGECONFIG ??= " \ 37PACKAGECONFIG ??= " \
39 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\ 38 ${@bb.utils.filter('DISTRO_FEATURES', 'directfb pam pulseaudio wayland x11', d)}\
40 gstreamer cups pcsc server \ 39 alsa gstreamer cups pcsc server \
41" 40"
42 41
43X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile" 42X11_DEPS = "virtual/libx11 libxinerama libxext libxcursor libxv libxi libxrender libxfixes libxdamage libxrandr libxkbfile"
@@ -50,6 +49,7 @@ PACKAGECONFIG[pulseaudio] = "-DWITH_PULSEAUDIO=ON,-DWITH_PULSEAUDIO=OFF,pulseaud
50PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base" 49PACKAGECONFIG[gstreamer] = "-DWITH_GSTREAMER_1_0=ON,-DWITH_GSTREAMER_1_0=OFF,gstreamer1.0 gstreamer1.0-plugins-base"
51PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups" 50PACKAGECONFIG[cups] = "-DWITH_CUPS=ON,-DWITH_CUPS=OFF,cups"
52PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF" 51PACKAGECONFIG[server] = "-DWITH_SERVER=ON,-DWITH_SERVER=OFF"
52PACKAGECONFIG[alsa] = "-DWITH_ALSA=ON,-DWITH_ALSA=OFF,alsa-lib"
53 53
54PACKAGES =+ "libfreerdp" 54PACKAGES =+ "libfreerdp"
55 55
@@ -92,3 +92,9 @@ python populate_packages:prepend () {
92 description='FreeRDP plugin %s', 92 description='FreeRDP plugin %s',
93 prepend=True, extra_depends='') 93 prepend=True, extra_depends='')
94} 94}
95
96CVE_STATUS[CVE-2024-32662] = "fixed-version: 2.x is not affected, bug was introduced in 3.0.0"
97
98# avoid http://errors.yoctoproject.org/Errors/Details/852862/
99# fixed in freerdp3 with https://github.com/FreeRDP/FreeRDP/pull/10553
100CFLAGS += "-std=gnu17"
diff --git a/meta-oe/recipes-support/function2/function2_4.2.4.bb b/meta-oe/recipes-support/function2/function2_4.2.4.bb
index 98d05f6e25..588e44deaa 100644
--- a/meta-oe/recipes-support/function2/function2_4.2.4.bb
+++ b/meta-oe/recipes-support/function2/function2_4.2.4.bb
@@ -8,7 +8,6 @@ PV .= "+git"
8 8
9SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https" 9SRC_URI += "gitsm://github.com/Naios/function2;branch=master;protocol=https"
10 10
11S = "${WORKDIR}/git"
12 11
13inherit cmake 12inherit cmake
14inherit ptest 13inherit ptest
diff --git a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
index 47b070557d..5333c25a9c 100644
--- a/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
+++ b/meta-oe/recipes-support/fuse/fuse3_3.16.2.bb
@@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = " \
16SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz" 16SRC_URI = "https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.gz"
17SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87" 17SRC_URI[sha256sum] = "f797055d9296b275e981f5f62d4e32e089614fc253d1ef2985851025b8a0ce87"
18 18
19S = "${WORKDIR}/fuse-${PV}" 19S = "${UNPACKDIR}/fuse-${PV}"
20 20
21UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" 21UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases"
22UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz" 22UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>3(\.\d+)+).tar.xz"
@@ -29,8 +29,9 @@ SRC_URI += " \
29 file://run-ptest \ 29 file://run-ptest \
30 file://fuse3.conf \ 30 file://fuse3.conf \
31" 31"
32 32#python3-compile for filecmp module
33RDEPENDS:${PN}-ptest += " \ 33RDEPENDS:${PN}-ptest += " \
34 python3-compile \
34 python3-pytest \ 35 python3-pytest \
35 python3-looseversion \ 36 python3-looseversion \
36 bash \ 37 bash \
diff --git a/meta-oe/recipes-support/gd/gd_2.3.3.bb b/meta-oe/recipes-support/gd/gd_2.3.3.bb
index cc2c1571e6..ea5c487c52 100644
--- a/meta-oe/recipes-support/gd/gd_2.3.3.bb
+++ b/meta-oe/recipes-support/gd/gd_2.3.3.bb
@@ -19,7 +19,6 @@ SRC_URI = "git://github.com/libgd/libgd.git;nobranch=1;protocol=https \
19 19
20SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc" 20SRCREV = "b5319a41286107b53daa0e08e402aa1819764bdc"
21 21
22S = "${WORKDIR}/git"
23 22
24inherit autotools binconfig gettext pkgconfig 23inherit autotools binconfig gettext pkgconfig
25 24
diff --git a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
index 4d97b1a419..2057caff78 100644
--- a/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
+++ b/meta-oe/recipes-support/gengetopt/gengetopt_2.23.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
8 8
9SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz" 9SRC_URI = "${GNU_MIRROR}/gengetopt/${BPN}-${PV}.tar.xz"
10 10
11SRC_URI[md5sum] = "ea165d618640dbdecb42ae4491337965"
12SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac" 11SRC_URI[sha256sum] = "b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac"
13 12
14inherit autotools texinfo 13inherit autotools texinfo
diff --git a/meta-oe/recipes-support/genimage/genimage_18.bb b/meta-oe/recipes-support/genimage/genimage_18.bb
new file mode 100644
index 0000000000..23169f5d44
--- /dev/null
+++ b/meta-oe/recipes-support/genimage/genimage_18.bb
@@ -0,0 +1,22 @@
1SUMMARY = "genimage - The image creation tool"
2DESCRIPTION = "Genimage is a tool for generating filesystem and disk/flash images \
3from a root filesystem tree or existing filesystem images."
4HOMEPAGE = "https://github.com/pengutronix/genimage"
5
6SECTION = "base"
7LICENSE = "GPL-2.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
9
10DEPENDS = "libconfuse"
11
12SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/genimage-${PV}.tar.xz"
13SRC_URI[sha256sum] = "ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd"
14
15EXTRA_OECONF = "--enable-largefile"
16
17inherit pkgconfig autotools gettext github-releases
18
19GITHUB_BASE_URI = "https://github.com/pengutronix/genimage/releases"
20UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)*)"
21
22BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
index a9a867b575..8ea158eab3 100644
--- a/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
+++ b/meta-oe/recipes-support/gflags/gflags_2.2.2.bb
@@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=c80d1a3b623f72bb85a4c75b556551df"
6SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https" 6SRC_URI = "git://github.com/gflags/gflags.git;branch=master;protocol=https"
7SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067" 7SRCREV = "e171aa2d15ed9eb17054558e0b3a6a413bb01067"
8 8
9S = "${WORKDIR}/git"
10 9
11inherit cmake 10inherit cmake
12 11
13EXTRA_OECMAKE="-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}" 12EXTRA_OECMAKE = "-DBUILD_SHARED_LIBS=ON -DREGISTER_INSTALL_PREFIX=OFF -DLIB_INSTALL_DIR=${baselib}"
14 13
15PACKAGES =+ "${PN}-bash-completion" 14PACKAGES =+ "${PN}-bash-completion"
16FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh" 15FILES:${PN}-bash-completion += "${bindir}/gflags_completions.sh"
diff --git a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch b/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
deleted file mode 100644
index 3732c62cd0..0000000000
--- a/meta-oe/recipes-support/glog/glog/0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 176230435cb4b64ff7f2d97f77a04579ad9ca239 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 18 Feb 2023 13:14:14 -0800
4Subject: [PATCH] Change SleepForMilliseconds parameter from unsigned int -> long
5
6Fixes following error on 32bit platforms
7
8src/googletest.h:631:35: error: non-constant-expression cannot be narrowed from type 'unsigned int' to 'long' in initializer list [-Wc++11-narrowing]
9 const struct timespec req = {0, t * 1000 * 1000};
10 ^~~~~~~~~~~~~~~
11
12Upstream-Status: Submitted [https://github.com/google/glog/pull/894]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/googletest.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/googletest.h b/src/googletest.h
19index 5761361..836b06c 100644
20--- a/src/googletest.h
21+++ b/src/googletest.h
22@@ -625,7 +625,7 @@ class Thread {
23 #endif
24 };
25
26-static inline void SleepForMilliseconds(unsigned t) {
27+static inline void SleepForMilliseconds(long t) {
28 #ifndef GLOG_OS_WINDOWS
29 # if defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199309L
30 const struct timespec req = {0, t * 1000 * 1000};
31--
322.39.2
33
diff --git a/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-oe/recipes-support/glog/glog/libexecinfo.patch
deleted file mode 100644
index a791a40dbc..0000000000
--- a/meta-oe/recipes-support/glog/glog/libexecinfo.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 19d00c15710840910a7397252c14d612746631fe Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 8 Mar 2021 14:58:40 -0800
4Subject: [PATCH] Link libexecinfo if its found, this is needed for musl based
5 systems
6
7Fixes
8ld: libglog.so.0.4.0: undefined reference to `backtrace'
9| collect2: error: ld returned 1 exit status
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 CMakeLists.txt | 5 +++++
16 1 file changed, 5 insertions(+)
17
18diff --git a/CMakeLists.txt b/CMakeLists.txt
19index 846b444..1553358 100644
20--- a/CMakeLists.txt
21+++ b/CMakeLists.txt
22@@ -162,6 +162,7 @@ cmake_pop_check_state ()
23 check_cxx_symbol_exists (snprintf cstdio HAVE_SNPRINTF)
24
25 check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP)
26+check_library_exists (execinfo backtrace "" HAVE_EXECINFO)
27
28 check_cxx_source_compiles ("
29 #include <cstdlib>
30@@ -629,6 +630,10 @@ if (Unwind_FOUND)
31 set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})")
32 endif (Unwind_FOUND)
33
34+if (HAVE_EXECINFO)
35+ target_link_libraries (glog PUBLIC execinfo)
36+endif (HAVE_EXECINFO)
37+
38 if (HAVE_DBGHELP)
39 target_link_libraries (glog PRIVATE dbghelp)
40 set (glog_libraries_options_for_static_linking "${glog_libraries_options_for_static_linking} -ldbghelp")
diff --git a/meta-oe/recipes-support/glog/glog_0.6.0.bb b/meta-oe/recipes-support/glog/glog_0.7.1.bb
index ec39604f44..570d9a7e5f 100644
--- a/meta-oe/recipes-support/glog/glog_0.6.0.bb
+++ b/meta-oe/recipes-support/glog/glog_0.7.1.bb
@@ -4,17 +4,14 @@ macros."
4HOMEPAGE = "https://github.com/google/glog" 4HOMEPAGE = "https://github.com/google/glog"
5 5
6LICENSE = "BSD-3-Clause" 6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" 7LIC_FILES_CHKSUM = "file://COPYING;md5=583a6ead531ca3cd5a2ea593a2888800"
8 8
9SRC_URI = " \ 9SRC_URI = " \
10 git://github.com/google/glog.git;branch=master;protocol=https \ 10 git://github.com/google/glog.git;branch=master;protocol=https \
11 file://libexecinfo.patch \
12 file://0001-Change-SleepForMilliseconds-parameter-from-unsigned-.patch \
13" 11"
14 12
15SRCREV = "b33e3bad4c46c8a6345525fd822af355e5ef9446" 13SRCREV = "7b134a5c82c0c0b5698bb6bf7a835b230c5638e4"
16 14
17S = "${WORKDIR}/git"
18 15
19inherit cmake 16inherit cmake
20 17
@@ -24,6 +21,7 @@ PACKAGECONFIG:remove:riscv32 = "unwind 64bit-atomics"
24PACKAGECONFIG:remove:mipsarch = "64bit-atomics" 21PACKAGECONFIG:remove:mipsarch = "64bit-atomics"
25PACKAGECONFIG:remove:armv5 = "64bit-atomics" 22PACKAGECONFIG:remove:armv5 = "64bit-atomics"
26PACKAGECONFIG:remove:armv6 = "64bit-atomics" 23PACKAGECONFIG:remove:armv6 = "64bit-atomics"
24PACKAGECONFIG:remove:powerpc = "64bit-atomics"
27 25
28PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo" 26PACKAGECONFIG:append:libc-musl:riscv64 = " execinfo"
29PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo" 27PACKAGECONFIG:append:libc-musl:riscv32 = " execinfo"
diff --git a/meta-oe/recipes-support/gnulib/gnulib_202401.bb b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
index 41675d3587..f3fbb94ae8 100644
--- a/meta-oe/recipes-support/gnulib/gnulib_202401.bb
+++ b/meta-oe/recipes-support/gnulib/gnulib_202401.bb
@@ -16,7 +16,6 @@ SRCREV = "c99c8d491850dc3a6e0b8604a2729d8bc5c0eff1"
16SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \ 16SRC_URI = "git://git.savannah.gnu.org/git/gnulib.git;branch=stable-${PV};protocol=https \
17" 17"
18 18
19S = "${WORKDIR}/git"
20 19
21do_install () { 20do_install () {
22 install -d ${D}/${datadir}/gnulib 21 install -d ${D}/${datadir}/gnulib
@@ -32,6 +31,5 @@ do_packagedata[noexec] = "1"
32deltask package_write_ipk 31deltask package_write_ipk
33deltask package_write_deb 32deltask package_write_deb
34deltask package_write_rpm 33deltask package_write_rpm
35deltask do_deploy_archives
36 34
37BBCLASSEXTEND = "native" 35BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch
deleted file mode 100644
index 3017314abe..0000000000
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 7f0e99af540a333108b92d792923ec7fc9e9fad9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 28 May 2024 20:14:54 -0700
4Subject: [PATCH] cycleclock: Fix type conversion to match function return type
5 (#1794)
6
7fixes build with clang19
8
9src/cycleclock.h:208:52: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long long') to 'int64_t' (aka 'long long') [-Werror,-Wsign-conversion]
10 208 | return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
11 | ~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~
121 error generated.
13
14Upstream-Status: Backport [https://github.com/google/benchmark/commit/7f0e99af540a333108b92d792923ec7fc9e9fad9]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/cycleclock.h | 3 ++-
18 1 file changed, 2 insertions(+), 1 deletion(-)
19
20diff --git a/src/cycleclock.h b/src/cycleclock.h
21index a25843760..c657414e5 100644
22--- a/src/cycleclock.h
23+++ b/src/cycleclock.h
24@@ -205,7 +205,8 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
25 "sub %0, zero, %0\n"
26 "and %1, %1, %0\n"
27 : "=r"(cycles_hi0), "=r"(cycles_lo), "=r"(cycles_hi1));
28- return (static_cast<uint64_t>(cycles_hi1) << 32) | cycles_lo;
29+ return static_cast<int64_t>((static_cast<uint64_t>(cycles_hi1) << 32) |
30+ cycles_lo);
31 #else
32 uint64_t cycles;
33 asm volatile("rdtime %0" : "=r"(cycles));
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch b/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch
deleted file mode 100644
index cc22a7e8a9..0000000000
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark/0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 54bca09aca6ccec41f852cb1f834463bc51290d0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 10 Jun 2024 21:45:22 -0700
4Subject: [PATCH] cycleclock: Fix type conversion to match function return type
5 on riscv64
6
7Fixes builds with clang
8
9src/cycleclock.h:213:10: error: implicit conversion changes signedness: 'uint64_t' (aka 'unsigned long') to 'int64_t' (aka 'long') [-Werror,-Wsign-conversion]
10 213 | return cycles;
11 | ~~~~~~ ^~~~~~
12 1 error generated.
13
14Upstream-Status: Submitted [https://github.com/google/benchmark/pull/1802]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/cycleclock.h | 2 +-
18 1 file changed, 1 insertion(+), 1 deletion(-)
19
20diff --git a/src/cycleclock.h b/src/cycleclock.h
21index c657414..bd62f5d 100644
22--- a/src/cycleclock.h
23+++ b/src/cycleclock.h
24@@ -210,7 +210,7 @@ inline BENCHMARK_ALWAYS_INLINE int64_t Now() {
25 #else
26 uint64_t cycles;
27 asm volatile("rdtime %0" : "=r"(cycles));
28- return cycles;
29+ return static_cast<int64_t>(cycles);
30 #endif
31 #elif defined(__e2k__) || defined(__elbrus__)
32 struct timeval tv;
diff --git a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb
index 706862f24a..4558aa13d6 100644
--- a/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.8.4.bb
+++ b/meta-oe/recipes-support/googlebenchmark/googlebenchmark_1.9.4.bb
@@ -4,12 +4,9 @@ SECTION = "libs"
4LICENSE = "Apache-2.0" 4LICENSE = "Apache-2.0"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
6 6
7SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main \ 7SRC_URI = "git://github.com/google/benchmark.git;protocol=https;branch=main;tag=v${PV}"
8 file://0001-cycleclock-Fix-type-conversion-to-match-function-ret.patch \ 8SRCREV = "eddb0241389718a23a42db6af5f0164b6e0139af"
9 file://0002-cycleclock-Fix-type-conversion-to-match-function-ret.patch"
10SRCREV = "a4cf155615c63e019ae549e31703bf367df5b471"
11 9
12S = "${WORKDIR}/git"
13 10
14EXTRA_OECMAKE = " \ 11EXTRA_OECMAKE = " \
15 -DBUILD_SHARED_LIBS=yes \ 12 -DBUILD_SHARED_LIBS=yes \
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
deleted file mode 100644
index 2ea54e48c9..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 06605158852f9364519391fa11070ba5ec4303e9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Sep 2017 08:07:17 -0700
4Subject: [PATCH] disbale heap checkers and debug allocator on musl
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7
8Upstream-Status: Pending
9
10---
11 configure.ac | 2 ++
12 1 file changed, 2 insertions(+)
13
14diff --git a/configure.ac b/configure.ac
15index 68fd51c..4cb71fe 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -53,6 +53,8 @@ case "$host" in
19 need_nanosleep=no;;
20 *-cygwin*) default_enable_cpu_profiler=no;;
21 *-linux*) default_enable_heap_checker=yes; heap_checker_supported=yes;;
22+ *-musl*) default_enable_heap_checker=no; default_enable_heap_profiler=no;
23+ default_enable_debugalloc=no; default_enable_libunwind=no;
24 esac
25
26 # Currently only backtrace works on s390 and OSX.
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch b/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch
deleted file mode 100644
index 1142df0be9..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch
+++ /dev/null
@@ -1,59 +0,0 @@
1From d675808d300278a9e7143428cfecf3fda61cc9a2 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Thu, 21 Mar 2024 10:59:29 +0000
4Subject: [PATCH] src/mmap_hook.cc: Fix build for 32bit machine
5
6Fixed build error on 32bit machine:
7
8../git/src/mmap_hook.cc:309:31: error: static assertion failed
9 309 | static_assert(sizeof(int32_t) == sizeof(off_t), "");
10
11This is because oe's off_t is 64bit on both 32 and 64bit system, which is the
12default value of glibc, so the assertion would be failed on 32bit system, and
13remove mmap() and mmap64() to fix the redefined error.
14
15Upstream-Status: Inappropriate [OE-Specific]
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18---
19 src/mmap_hook.cc | 22 ----------------------
20 1 file changed, 22 deletions(-)
21
22diff --git a/src/mmap_hook.cc b/src/mmap_hook.cc
23index 0a0f62f..27425e4 100644
24--- a/src/mmap_hook.cc
25+++ b/src/mmap_hook.cc
26@@ -302,30 +302,8 @@ void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off) _
27
28 #define HOOKED_MMAP
29
30-#elif defined(DEFINED_DO_MMAP) && defined(__linux__) && !GOOD_LINUX_SYSTEM
31-// Linuxes with 32-bit off_t. We're being careful with mmap64 being
32-// 64-bit and mmap being 32-bit.
33-
34-static_assert(sizeof(int32_t) == sizeof(off_t), "");
35-
36-extern "C" void* mmap64(void* start, size_t length, int prot, int flags, int fd, int64_t off)
37- __THROW ATTRIBUTE_SECTION(malloc_hook);
38-extern "C" void* mmap(void* start, size_t length, int prot, int flags, int fd, off_t off)
39- __THROW ATTRIBUTE_SECTION(malloc_hook);
40-
41-void* mmap(void *start, size_t length, int prot, int flags, int fd, off_t off) __THROW {
42- return do_mmap_with_hooks(start, length, prot, flags, fd, off);
43-}
44-
45-void* mmap64(void *start, size_t length, int prot, int flags, int fd, int64_t off) __THROW {
46- return do_mmap_with_hooks(start, length, prot, flags, fd, off);
47-}
48-
49-#define HOOKED_MMAP
50-
51 #endif // Linux/32-bit off_t case
52
53-
54 #ifdef HOOKED_MMAP
55
56 extern "C" int munmap(void* start, size_t length) __THROW ATTRIBUTE_SECTION(malloc_hook);
57--
582.35.5
59
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch
new file mode 100644
index 0000000000..eae71be8fc
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch
@@ -0,0 +1,35 @@
1From 02ff9fcc74ba64aeb22fcc553f30657bd2b62930 Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Wed, 26 Feb 2025 23:46:56 -0800
4Subject: [PATCH 2/3] src/base/elf_mem_image.cc: fix build for musl
5
6Include header file for musl to avoid error below:
7
8 error: '__WORDSIZE' was not declared in this scope
9
10Upstream-Status: Pending
11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13---
14 src/base/elf_mem_image.cc | 5 +++++
15 1 file changed, 5 insertions(+)
16
17diff --git a/src/base/elf_mem_image.cc b/src/base/elf_mem_image.cc
18index d2ca1a5..89dc0e4 100644
19--- a/src/base/elf_mem_image.cc
20+++ b/src/base/elf_mem_image.cc
21@@ -38,6 +38,11 @@
22
23 #ifdef HAVE_ELF_MEM_IMAGE // defined in elf_mem_image.h
24
25+// for musl __WORDSIZE definition
26+#if !defined(__GLIBC__)
27+#include <sys/reg.h>
28+#endif
29+
30 #include <stddef.h> // for size_t, ptrdiff_t
31 #include "base/logging.h"
32
33--
342.25.1
35
diff --git a/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch
new file mode 100644
index 0000000000..01ecdd5336
--- /dev/null
+++ b/meta-oe/recipes-support/gperftools/gperftools/0003-Makefile.am-disable-building-noinst-tests-for-musl.patch
@@ -0,0 +1,32 @@
1From 3bb5707c6a6a0d2061c79c556cbe4a87efea02ab Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Thu, 27 Feb 2025 00:44:34 -0800
4Subject: [PATCH 3/3] Makefile.am: disable building noinst tests for musl
5
6Build fails for musl + qemuppc64 about ld failing to find
7symbols in libucontext. Until a real solution is found,
8we need this workaround.
9
10Upstream-Status: Inappropriate [OE Specific]
11
12Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
13---
14 Makefile.am | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/Makefile.am b/Makefile.am
18index 9fa24c0..7dd1b60 100644
19--- a/Makefile.am
20+++ b/Makefile.am
21@@ -938,7 +938,7 @@ endif WITH_HEAP_PROFILER_OR_CHECKER
22 # This should always include $(TESTS), but may also include other
23 # binaries that you compile but don't want automatically installed.
24 # We'll add to this later, on a library-by-library basis
25-noinst_PROGRAMS += $(TESTS)
26+#noinst_PROGRAMS += $(TESTS)
27
28 # http://linux.die.net/man/1/pkg-config, http://pkg-config.freedesktop.org/wiki
29 pkgconfigdir = $(libdir)/pkgconfig
30--
312.25.1
32
diff --git a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch b/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
deleted file mode 100644
index 15eacc8993..0000000000
--- a/meta-oe/recipes-support/gperftools/gperftools/disable_libunwind_aarch64.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 564f800e3e24647c095f7a321bf3ebdccfbf762d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 2 Sep 2017 12:02:04 -0700
4Subject: [PATCH] Disable libunwind on aarch64
5
6Fixes hangs when using libtcmalloc.so
7
8Upstream-Status: Pending
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11---
12 configure.ac | 5 +++++
13 1 file changed, 5 insertions(+)
14
15--- a/configure.ac
16+++ b/configure.ac
17@@ -76,6 +76,11 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [re
18 [default_enable_libunwind=yes
19 default_tcmalloc_pagesize=8])
20
21+# Disable libunwind linking on aarch64 by default.
22+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(, [return __aarch64__])],
23+ [default_enable_libunwind=no],
24+ [default_enable_libunwind=yes])
25+
26 AC_ARG_ENABLE([cpu-profiler],
27 [AS_HELP_STRING([--disable-cpu-profiler],
28 [do not build the cpu profiler])],
diff --git a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
index 800fa3a84f..e5061840bc 100644
--- a/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
+++ b/meta-oe/recipes-support/gperftools/gperftools/ppc-musl.patch
@@ -1,20 +1,21 @@
1From 328805fd16930deefda400a77e9c2c5d17d04d29 Mon Sep 17 00:00:00 2001 1From 1526be49b8c49719459ef15c93090fdbdc10f3cb Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 13 Mar 2021 00:42:25 -0800 3Date: Sat, 13 Mar 2021 00:42:25 -0800
4Subject: [PATCH] Compatibility fixes for musl. 4Subject: [PATCH 1/3] Compatibility fixes for musl.
5 5
6---
7Upstream-Status: Pending 6Upstream-Status: Pending
8 7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9---
9 src/getpc.h | 4 ++++ 10 src/getpc.h | 4 ++++
10 src/stacktrace_powerpc-linux-inl.h | 8 ++++++-- 11 src/stacktrace_powerpc-linux-inl.h | 8 ++++++--
11 2 files changed, 10 insertions(+), 2 deletions(-) 12 2 files changed, 10 insertions(+), 2 deletions(-)
12 13
13diff --git a/src/getpc.h b/src/getpc.h 14diff --git a/src/getpc.h b/src/getpc.h
14index 87d18b6..c569731 100644 15index c14c9d0..cf4866b 100644
15--- a/src/getpc.h 16--- a/src/getpc.h
16+++ b/src/getpc.h 17+++ b/src/getpc.h
17@@ -68,6 +68,10 @@ 18@@ -61,6 +61,10 @@
18 typedef ucontext ucontext_t; 19 typedef ucontext ucontext_t;
19 #endif 20 #endif
20 21
@@ -59,3 +60,6 @@ index 883e7d2..212bd25 100644
59 } 60 }
60 #endif 61 #endif
61 62
63--
642.25.1
65
diff --git a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb b/meta-oe/recipes-support/gperftools/gperftools_2.16.bb
index bd3b2afaea..c0fe586f6d 100644
--- a/meta-oe/recipes-support/gperftools/gperftools_2.15.bb
+++ b/meta-oe/recipes-support/gperftools/gperftools_2.16.bb
@@ -10,18 +10,17 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=762732742c73dc6c7fbe8632f06c059a"
10 10
11DEPENDS:append:libc-musl = " libucontext" 11DEPENDS:append:libc-musl = " libucontext"
12 12
13SRCREV = "365060c4213a48adb27f63d5dfad41b3dfbdd62e" 13SRCREV = "e1014dead2029b341d06027b4f2b5562d799d5b1"
14SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https \ 14SRC_URI = "git://github.com/gperftools/gperftools;branch=master;protocol=https"
15 file://0001-disbale-heap-checkers-and-debug-allocator-on-musl.patch \
16 file://disable_libunwind_aarch64.patch \
17 file://0001-src-mmap_hook.cc-Fix-build-for-32bit-machine.patch \
18 "
19 15
20SRC_URI:append:libc-musl = " file://ppc-musl.patch" 16SRC_URI:append:libc-musl = " \
17 file://ppc-musl.patch \
18 file://0002-src-base-elf_mem_image.cc-fix-build-for-musl.patch \
19 file://0003-Makefile.am-disable-building-noinst-tests-for-musl.patch \
20 "
21 21
22inherit autotools 22inherit autotools
23 23
24S = "${WORKDIR}/git"
25 24
26# On mips, we have the following error. 25# On mips, we have the following error.
27# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008 26# do_page_fault(): sending SIGSEGV to ls for invalid read access from 00000008
diff --git a/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch b/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch
new file mode 100644
index 0000000000..ad10c9848c
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0001-Avoid-shadowing-ncurses-functions.patch
@@ -0,0 +1,234 @@
1From 8acd38879bcdeb34700ab1989e0dd6245af04706 Mon Sep 17 00:00:00 2001
2From: NHOrus <jy6x2b32pie9@yahoo.com>
3Date: Tue, 11 Feb 2025 18:42:47 +0400
4Subject: [PATCH 1/3] Avoid shadowing ncurses functions. This fails with GCC-15
5 and other compilers implementing C23 Added prefix gpm_ to raw() and noraw()
6 used in two files because they are implemented in same two files, and are
7 static. Same with scr_dump() and src_restore() in yacc source file
8
9Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
10Signed-off-by: mark.yang <mark.yang@lge.com>
11---
12 src/prog/gpm-root.y | 10 +++++-----
13 src/prog/hltest.c | 11 +++++------
14 src/prog/mouse-test.c | 24 ++++++++++++------------
15 3 files changed, 22 insertions(+), 23 deletions(-)
16
17diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
18index 76c896c..800e51b 100644
19--- a/src/prog/gpm-root.y
20+++ b/src/prog/gpm-root.y
21@@ -941,7 +941,7 @@ static unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4};
22 static unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1;
23
24 /*------------*/
25-static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
26+static inline void gpm_scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
27 {
28 int dumpfd;
29 char dumpname[20];
30@@ -960,7 +960,7 @@ static inline void scr_dump(int fd, FILE *f, unsigned char *buffer, int vc)
31 }
32
33 /*------------*/
34-static inline void scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
35+static inline void gpm_scr_restore(int fd, FILE *f, unsigned char *buffer, int vc)
36 {
37 int dumpfd;
38 char dumpname[20];
39@@ -1002,7 +1002,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
40 if (!new) return NULL;
41 new->draw=draw;
42 new->dump=dump=malloc(opt_buf);
43- scr_dump(fd,f,dump,console);
44+ gpm_scr_dump(fd,f,dump,console);
45 lines=dump[0]; columns=dump[1];
46 i=(columns*dump[3]+dump[2])*2+1; /* where to get it */
47 if (i<0) i=1;
48@@ -1060,7 +1060,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
49 for (i=0; i<draw->width; i++) PUTC(HORLINE,draw->bord,draw->back);
50 PUTC(LRCORNER,draw->bord,draw->back);
51
52- scr_restore(fd,f,dump,console);
53+ gpm_scr_restore(fd,f,dump,console);
54 free(dump);
55
56 #undef PUTC
57@@ -1077,7 +1077,7 @@ Posted *unpostmenu(int fd, FILE *f, Posted *which, int vc)
58 {
59 Posted *prev=which->prev;
60
61- scr_restore(fd,f,which->dump, vc);
62+ gpm_scr_restore(fd,f,which->dump, vc);
63 ioctl(fd,TCXONC,TCOON); /* activate the console */
64 free(which->dump);
65 free(which);
66diff --git a/src/prog/hltest.c b/src/prog/hltest.c
67index cce0abc..a916873 100644
68--- a/src/prog/hltest.c
69+++ b/src/prog/hltest.c
70@@ -80,7 +80,6 @@ int wid,hei,vcsize;
71 unsigned short clear_sel_args[6]={0, 0,0, 0,0, 4};
72 unsigned char *clear_sel_arg= (unsigned char *)clear_sel_args+1;
73
74-
75 static inline int scrdump(char *buf)
76 {
77 clear_sel_arg[0]=2; /* clear_selection */
78@@ -99,7 +98,7 @@ static inline int scrrestore(char *buf)
79
80
81 /* I don't like curses, so I'm doing low level stuff here */
82-static void raw(void)
83+static void gpm_raw(void)
84 {
85 struct termios it;
86
87@@ -115,7 +114,7 @@ tcsetattr(fileno(stdin),TCSANOW,&it);
88
89 }
90
91-static void noraw(void)
92+static void gpm_noraw(void)
93 {
94 struct termios it;
95
96@@ -136,7 +135,7 @@ void killed(int signo)
97 {
98 CLEAR;
99 fprintf(stderr,"hltest: killed by signal %i\r\n",signo);
100- noraw();
101+ gpm_noraw();
102 exit(0);
103 }
104
105@@ -525,7 +524,7 @@ int main(int argc, char **argv)
106 gpm_roi_handler=xhandler;
107 gpm_roi_data=NULL;
108
109- raw();
110+ gpm_raw();
111 newmsg(0,NULL); /* init data structures */
112 while((c=Gpm_Getchar())!=EOF) {
113 char s[32];
114@@ -538,6 +537,6 @@ int main(int argc, char **argv)
115 newmsg(roi ? ((WinInfo *)roi->clientdata)->number : 0,s);
116 }
117
118- noraw();
119+ gpm_noraw();
120 exit(0);
121 }
122diff --git a/src/prog/mouse-test.c b/src/prog/mouse-test.c
123index d7d1027..0db3560 100644
124--- a/src/prog/mouse-test.c
125+++ b/src/prog/mouse-test.c
126@@ -106,7 +106,7 @@ return 0;
127 /*-----------------------------------------------------------------------------
128 Place the description here.
129 -----------------------------------------------------------------------------*/
130-static void raw(void)
131+static void gpm_raw(void)
132 {
133 struct termios it;
134
135@@ -125,7 +125,7 @@ static void raw(void)
136 /*-----------------------------------------------------------------------------
137 Place the description here.
138 -----------------------------------------------------------------------------*/
139-static void noraw(void)
140+static void gpm_noraw(void)
141 {
142 struct termios it;
143
144@@ -144,7 +144,7 @@ static void noraw(void)
145 void killed(int signo)
146 {
147 fprintf(stderr,"mouse-test: killed by signal %i\r\n",signo);
148- noraw();
149+ gpm_noraw();
150 exit(0);
151 }
152
153@@ -196,7 +196,7 @@ int mousereopen(int oldfd, const char *name, Gpm_Type *type)
154
155 int noneofthem(void)
156 {
157- noraw();
158+ gpm_noraw();
159 printf("\n\nSomething went wrong, I didn't manage to detect your"
160 "protocol\n\nFeel free to report your problems to the author\n");
161 exit(1);
162@@ -336,7 +336,7 @@ int main(int argc, char **argv)
163 I_serial=mice->init; /* the first one has I_serial */
164
165 signal(SIGINT,killed); /* control-C kills us */
166- raw();
167+ gpm_raw();
168
169 /*====================================== First of all, detect the device */
170
171@@ -568,7 +568,7 @@ int main(int argc, char **argv)
172 /* why checking and not using return value ??? */
173 CHECKFAIL(typecount);
174 if (typecount==1) {
175- noraw();
176+ gpm_noraw();
177 printf("\n\n\nWell, it seems like your mouse is already detected:\n"
178 "it is on the device \"%s\", and speaks the protocol \"%s\"\n",
179 mousename,list->this->name);
180@@ -587,7 +587,7 @@ int main(int argc, char **argv)
181 } while(i!='y' && i!='n');
182
183 if (i=='n') {
184- noraw();
185+ gpm_noraw();
186 printf("\nThen, you should use the \"bare\" protocol on \"%s\"\n",
187 mousename);
188 exit(0);
189@@ -634,7 +634,7 @@ int main(int argc, char **argv)
190 for (pending=0,i=0;i<got-16;i++)
191 if(!memcmp(buf+i,buf+i+8,8)) pending++;
192 if (pending > 3) {
193- noraw();
194+ gpm_noraw();
195 printf("\nYour mouse seems to be a 'mman' one on \"%s\" (%i matches)\n",
196 mousename,pending);
197 exit(0);
198@@ -660,7 +660,7 @@ int main(int argc, char **argv)
199 continue;
200 }
201 if (pending>3) {
202- noraw();
203+ gpm_noraw();
204 printf("\nYour mouse seems to be a '%s' one on \"%s\" (%i matches)\n",
205 cur->this->name,mousename,pending);
206 exit(0);
207@@ -695,7 +695,7 @@ int main(int argc, char **argv)
208 for (pending=0,i=0;i<got-20;i++)
209 if(!memcmp(buf+i,buf+i+10,10)) pending++;
210 if (pending>3) {
211- noraw();
212+ gpm_noraw();
213 printf("\nYour mouse becomes a 3-buttons ('-t msc') one when\n"
214 "gpm gets '-o %s' on it command line, and X gets\n"
215 "%s in XF86Config\nThe device is \"%s\"",
216@@ -726,7 +726,7 @@ int main(int argc, char **argv)
217 for (pending=0,i=0;i<got-20;i++)
218 if(!memcmp(buf+i,buf+i+10,10)) pending++;
219 if (pending>3) {
220- noraw();
221+ gpm_noraw();
222 printf("\nWorked. You should keep the button pressed every time the\n"
223 "computer boots, and run gpm in '-R' mode in order to ignore\n"
224 "such hassle when starting X\n\nStill better, but a better mouse\n"
225@@ -734,7 +734,7 @@ int main(int argc, char **argv)
226
227 exit(0);
228 }
229- noraw();
230+ gpm_noraw();
231 printf("\nI'm lost. Can't tell you how to use your middle button\n");
232 return 0;
233 }
234
diff --git a/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch b/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch
new file mode 100644
index 0000000000..4534de9be4
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0002-Fix-function-definition-in-yacc-source-file-until-va.patch
@@ -0,0 +1,81 @@
1From 155873ed357a94f06e7e7032e27acba58bba8214 Mon Sep 17 00:00:00 2001
2From: NHOrus <jy6x2b32pie9@yahoo.com>
3Date: Tue, 11 Feb 2025 19:01:48 +0400
4Subject: [PATCH 2/3] Fix function definition in yacc source file until valid
5 C23. Fill empty argument lists with values. Add 0 as third argument for
6 two-argument function, it will be ignored at call site.
7
8Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
9Signed-off-by: mark.yang <mark.yang@lge.com>
10---
11 src/prog/gpm-root.y | 14 +++++++-------
12 1 file changed, 7 insertions(+), 7 deletions(-)
13
14diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y
15index 800e51b..f06872c 100644
16--- a/src/prog/gpm-root.y
17+++ b/src/prog/gpm-root.y
18@@ -128,7 +128,7 @@ typedef struct DrawItem {
19 char *name;
20 char *arg; /* a cmd string */
21 void *clientdata; /* a (Draw *) for menus or whatever */
22- int (*fun)();
23+ int (*fun)(int, struct DrawItem *, int);
24 struct DrawItem *next;
25 } DrawItem;
26
27@@ -159,7 +159,7 @@ int yyerror(char *s);
28 int yylex(void);
29
30 DrawItem *cfg_cat(DrawItem *, DrawItem *);
31-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail);
32+DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int, DrawItem *, int), void *detail);
33
34
35 /*===================================================================*
36@@ -195,7 +195,7 @@ int f_pipe(int mode, DrawItem *self, int uid);
37 char *string;
38 Draw *draw;
39 DrawItem *item;
40- int (*fun)();
41+ int (*fun)(int, DrawItem *, int);
42 }
43
44 %token <string> T_STRING
45@@ -284,7 +284,7 @@ struct tokenName tokenList[] = {
46 struct funcName {
47 char *name;
48 int token;
49- int (*fun)();
50+ int (*fun)(int, DrawItem *, int);
51 };
52 struct funcName funcList[] = {
53 {"f.debug",T_FUNC,f_debug},
54@@ -390,7 +390,7 @@ Draw *cfg_alloc(void)
55
56 /*---------------------------------------------------------------------*/
57 /* malloc an empty DrawItem and fill it */
58-DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail)
59+DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(int, DrawItem *, int), void *detail)
60 {
61 DrawItem *new=calloc(1,sizeof(DrawItem));
62
63@@ -405,7 +405,7 @@ DrawItem *cfg_makeitem(int mode, char *msg, int(*fun)(), void *detail)
64
65 case 'F': /* a function without args */
66 new->fun=fun;
67- if (fun) fun(F_CREATE,new);
68+ if (fun) fun(F_CREATE,new,0);
69 break;
70
71 case 'M':
72@@ -1047,7 +1047,7 @@ Posted *postmenu(int fd, FILE *f, Draw *draw, int x, int y, int console)
73 }
74 /* sides and items */
75 for (item=draw->menu; y++, item; item=item->next) {
76- if (item->fun) (*(item->fun))(F_POST,item);
77+ if (item->fun) (*(item->fun))(F_POST,item,0);
78 GOTO(x,y); PUTC(VERLINE,draw->bord,draw->back);
79 for (i=0;i<item->pad;i++) PUTC(' ',draw->fore,draw->back);
80 PUTS(item->name,draw->fore,draw->back); i+=strlen(item->name);
81
diff --git a/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch b/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch
new file mode 100644
index 0000000000..0913c809c8
--- /dev/null
+++ b/meta-oe/recipes-support/gpm/gpm/0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch
@@ -0,0 +1,37 @@
1From d8224863233ae64310a1ee91b9f4e77daf9cfd10 Mon Sep 17 00:00:00 2001
2From: NHOrus <jy6x2b32pie9@yahoo.com>
3Date: Sat, 22 Feb 2025 01:12:32 +0400
4Subject: [PATCH 3/3] Add incomplete type definition for WINDOW in Gpm_Wgetch()
5
6Window handle is an opaque pointer that Gpm_Wgetch() passes
7through straight to ncurses if it's not null and calls getch
8if it's null. Code doesn't care what's inside the handle
9as long as it agrees with curses definition.
10
11Upstream-Status: Submitted [https://github.com/telmich/gpm/pull/49]
12Signed-off-by: mark.yang <mark.yang@lge.com>
13---
14 src/headers/gpm.h | 9 ++++++++-
15 1 file changed, 8 insertions(+), 1 deletion(-)
16
17diff --git a/src/headers/gpm.h b/src/headers/gpm.h
18index fe52e53..b944d4b 100644
19--- a/src/headers/gpm.h
20+++ b/src/headers/gpm.h
21@@ -268,7 +268,14 @@ Gpm_Roi * Gpm_LowerRoi(Gpm_Roi *which, Gpm_Roi *after);
22 /* libcurses.c */
23 /* #include <curses.h> Hmm... seems risky */
24
25-extern int Gpm_Wgetch();
26+/* Window handle is an opaque pointer that Gpm_Wgetch()
27+ * passes through to ncurses if it's not null and calls getch
28+ * if it's null. Code doesn't care what's inside the handle
29+ * as long as it agrees with curses definition.
30+*/
31+typedef struct _win_st WINDOW;
32+
33+extern int Gpm_Wgetch(WINDOW *);
34 #define Gpm_Getch() (Gpm_Wgetch(NULL))
35
36 /* libxtra.c */
37
diff --git a/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-oe/recipes-support/gpm/gpm_git.bb
index 25e5414a35..155e56bdef 100644
--- a/meta-oe/recipes-support/gpm/gpm_git.bb
+++ b/meta-oe/recipes-support/gpm/gpm_git.bb
@@ -15,15 +15,21 @@ DEPENDS = "ncurses bison-native"
15SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \ 15SRC_URI = "git://github.com/telmich/gpm;protocol=https;branch=master \
16 file://init \ 16 file://init \
17 file://gpm.service.in \ 17 file://gpm.service.in \
18 file://0001-Avoid-shadowing-ncurses-functions.patch \
19 file://0002-Fix-function-definition-in-yacc-source-file-until-va.patch \
20 file://0003-Add-incomplete-type-definition-for-WINDOW-in-Gpm_Wge.patch \
18 " 21 "
19 22
20S = "${WORKDIR}/git"
21 23
22inherit autotools-brokensep update-rc.d systemd texinfo 24inherit autotools-brokensep update-rc.d systemd texinfo
23 25
24INITSCRIPT_NAME = "gpm" 26INITSCRIPT_NAME = "gpm"
25INITSCRIPT_PARAMS = "defaults" 27INITSCRIPT_PARAMS = "defaults"
26 28
29# Avoid line statements with bison/yacc
30# ERROR: lib32-gpm-1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530-r0 do_package_qa: QA Issue: File /usr/src/debug/lib32-gpm/1.99.7+gite82d1a653ca94aa4ed12441424da6ce780b1e530/src/prog/gpm-root.c in package lib32-gpm-src contains reference to TMPDIR [buildpaths]
31EXTRA_OEMAKE = "YFLAGS='-l'"
32
27do_configure:prepend() { 33do_configure:prepend() {
28 (cd ${S};./autogen.sh;cd -) 34 (cd ${S};./autogen.sh;cd -)
29} 35}
diff --git a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
index c82b529f96..c0eb3e02d8 100644
--- a/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
+++ b/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb
@@ -18,9 +18,9 @@ SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \
18 " 18 "
19SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" 19SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9"
20 20
21S = "${WORKDIR}/gradm" 21UPSTREAM_CHECK_URI = "https://grsecurity.net/download"
22 22
23inherit autotools-brokensep 23S = "${UNPACKDIR}/gradm"
24 24
25do_compile() { 25do_compile() {
26 oe_runmake 'CC=${CC}' \ 26 oe_runmake 'CC=${CC}' \
diff --git a/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
index 5528e87e6c..0956eb121c 100644
--- a/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
+++ b/meta-oe/recipes-support/gsoap/gsoap_2.8.134.bb
@@ -13,7 +13,7 @@ inherit autotools
13 13
14BBCLASSEXTEND = "native" 14BBCLASSEXTEND = "native"
15 15
16S = "${WORKDIR}/${BPN}-2.8" 16S = "${UNPACKDIR}/${BPN}-2.8"
17 17
18EXTRA_OECONF += "--enable-ipv6 --enable-c-locale" 18EXTRA_OECONF += "--enable-ipv6 --enable-c-locale"
19PARALLEL_MAKE = "" 19PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
index 75feccb87c..5930a8c95c 100644
--- a/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
+++ b/meta-oe/recipes-support/hddtemp/hddtemp_0.3-beta15.bb
@@ -15,7 +15,6 @@ SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/hddtemp/hddtemp-0.3-beta15.tar.bz2 \
15 file://init \ 15 file://init \
16" 16"
17 17
18SRC_URI[md5sum] = "8b829339e1ae9df701684ec239021bb8"
19SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b" 18SRC_URI[sha256sum] = "618541584054093d53be8a2d9e81c97174f30f00af91cb8700a97e442d79ef5b"
20 19
21LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a" 20LIC_FILES_CHKSUM = "file://GPL-2;md5=eb723b61539feef013de476e68b5c50a"
diff --git a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
index 68d9c3a3cf..0d016ccb4c 100644
--- a/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
+++ b/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch
@@ -1,6 +1,6 @@
1From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 1From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Tue, 19 Sep 2023 02:56:09 +0000 3Date: Tue, 16 Jul 2024 17:54:29 +0800
4Subject: [PATCH] cmake: remove build flags 4Subject: [PATCH] cmake: remove build flags
5 5
6Don't generate the build host related info and reemove the build flags 6Don't generate the build host related info and reemove the build flags
@@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific]
11Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 11Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
12--- 12---
13 config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- 13 config/cmake/libhdf5.settings.cmake.in | 18 +++++++++---------
14 src/H5make_libsettings.c | 17 ----------------- 14 1 file changed, 9 insertions(+), 9 deletions(-)
15 2 files changed, 9 insertions(+), 26 deletions(-)
16 15
17diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in 16diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in
18index f60f0de..f4433c0 100644 17index deb07ed..6f255c4 100644
19--- a/config/cmake/libhdf5.settings.cmake.in 18--- a/config/cmake/libhdf5.settings.cmake.in
20+++ b/config/cmake/libhdf5.settings.cmake.in 19+++ b/config/cmake/libhdf5.settings.cmake.in
21@@ -23,23 +23,23 @@ Linking Options: 20@@ -23,23 +23,23 @@ Linking Options:
@@ -28,7 +27,7 @@ index f60f0de..f4433c0 100644
28 AM_LDFLAGS: @AM_LDFLAGS@ 27 AM_LDFLAGS: @AM_LDFLAGS@
29 Extra libraries: @LINK_LIBS@ 28 Extra libraries: @LINK_LIBS@
30- Archiver: @CMAKE_AR@ 29- Archiver: @CMAKE_AR@
31- AR_FLAGS: 30- AR_FLAGS:
32- Ranlib: @CMAKE_RANLIB@ 31- Ranlib: @CMAKE_RANLIB@
33+ Archiver: 32+ Archiver:
34+ AR_FLAGS: 33+ AR_FLAGS:
@@ -63,34 +62,6 @@ index f60f0de..f4433c0 100644
63 H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ 62 H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@
64 AM C++ Flags: @AM_CXXFLAGS@ 63 AM C++ Flags: @AM_CXXFLAGS@
65 Shared C++ Library: @H5_ENABLE_SHARED_LIB@ 64 Shared C++ Library: @H5_ENABLE_SHARED_LIB@
66diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c
67index 2661288..7c0f84f 100644
68--- a/src/H5make_libsettings.c
69+++ b/src/H5make_libsettings.c
70@@ -205,23 +205,6 @@ information about the library build configuration\n";
71 fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n");
72 fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */
73
74- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday,
75- 1900 + tm->tm_year);
76- if (pwd || real_name[0] || host_name[0]) {
77- fprintf(rawoutstream, " *\t\t\t");
78- if (real_name[0])
79- fprintf(rawoutstream, "%s <", real_name);
80-#ifdef H5_HAVE_GETPWUID
81- if (pwd)
82- fputs(pwd->pw_name, rawoutstream);
83-#endif
84- if (host_name[0])
85- fprintf(rawoutstream, "@%s", host_name);
86- if (real_name[0])
87- fprintf(rawoutstream, ">");
88- fputc('\n', rawoutstream);
89- }
90-
91 fprintf(rawoutstream, " *\n * Purpose:\t\t");
92
93 for (s = purpose; *s; s++) {
94-- 65--
952.35.5 662.25.1
96 67
diff --git a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb
index b8a81bb0b7..edaf5710e1 100644
--- a/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb
+++ b/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb
@@ -5,18 +5,18 @@ HOMEPAGE = "https://www.hdfgroup.org/"
5SECTION = "libs" 5SECTION = "libs"
6 6
7LICENSE = "HDF5" 7LICENSE = "HDF5"
8LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" 8LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e"
9 9
10inherit cmake siteinfo qemu multilib_header multilib_script 10inherit cmake siteinfo qemu multilib_header multilib_script
11 11
12DEPENDS += "qemu-native zlib" 12DEPENDS += "qemu-native zlib"
13 13
14SRC_URI = " \ 14SRC_URI = " \
15 https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ 15 https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \
16 file://0002-Remove-suffix-shared-from-shared-library-name.patch \ 16 file://0002-Remove-suffix-shared-from-shared-library-name.patch \
17 file://0001-cmake-remove-build-flags.patch \ 17 file://0001-cmake-remove-build-flags.patch \
18" 18"
19SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" 19SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03"
20 20
21FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" 21FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*"
22 22
@@ -37,6 +37,7 @@ $qemu_binary "\$@"
37EOF 37EOF
38 chmod +x ${WORKDIR}/qemuwrapper 38 chmod +x ${WORKDIR}/qemuwrapper
39} 39}
40gen_emu:class-native = ""
40 41
41do_unpack[postfuncs] += "gen_emu" 42do_unpack[postfuncs] += "gen_emu"
42 43
@@ -44,10 +45,13 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \
44 ${PN}:${bindir}/h5hlcc \ 45 ${PN}:${bindir}/h5hlcc \
45" 46"
46 47
48do_configure:append() {
49 sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings
50 sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c
51}
52
47do_install:append() { 53do_install:append() {
48 # Used for generating config files on target 54 # Used for generating config files on target
49 install -m 755 ${B}/bin/H5detect ${D}${bindir}
50 install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir}
51 oe_multilib_header H5pubconf.h 55 oe_multilib_header H5pubconf.h
52 # remove the buildpath 56 # remove the buildpath
53 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc 57 sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc
diff --git a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb b/meta-oe/recipes-support/hidapi/hidapi_0.15.0.bb
index c7a487ba5c..7d2c87d02d 100644
--- a/meta-oe/recipes-support/hidapi/hidapi_0.14.0.bb
+++ b/meta-oe/recipes-support/hidapi/hidapi_0.15.0.bb
@@ -11,5 +11,4 @@ RDEPENDS:${PN}:append:libc-glibc = " glibc-gconv-utf-16"
11inherit autotools pkgconfig 11inherit autotools pkgconfig
12 12
13SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master" 13SRC_URI = "git://github.com/libusb/hidapi.git;protocol=https;branch=master"
14SRCREV = "d3013f0af3f4029d82872c1a9487ea461a56dee4" 14SRCREV = "d6b2a974608dec3b76fb1e36c189f22b9cf3650c"
15S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
index a641feef6f..0ee900ca3d 100644
--- a/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
+++ b/meta-oe/recipes-support/hstr/hstr_3.1.0.bb
@@ -10,7 +10,7 @@ SRC_URI = "https://github.com/dvorka/hstr/releases/download/3.1/hstr-${PV}-tarba
10 file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \ 10 file://0001-configure.ac-Don-t-use-AC_CHECK_FILE.patch \
11 file://0001-Use-OE-specific-checks-for-ncurses.patch" 11 file://0001-Use-OE-specific-checks-for-ncurses.patch"
12 12
13S = "${WORKDIR}/${BPN}" 13S = "${UNPACKDIR}/${BPN}"
14 14
15SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5" 15SRC_URI[sha256sum] = "4dabf61f045f022bac8bc909e5fd96041af6c53df56d97dfa3cfbf49af4453a5"
16 16
diff --git a/meta-oe/recipes-support/htop/htop_3.3.0.bb b/meta-oe/recipes-support/htop/htop_3.3.0.bb
index cd5b766f0f..efb89bf3ae 100644
--- a/meta-oe/recipes-support/htop/htop_3.3.0.bb
+++ b/meta-oe/recipes-support/htop/htop_3.3.0.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/htop-dev/htop.git;branch=main;protocol=https \
11" 11"
12SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54" 12SRCREV = "68c970c7ef4a0682760ed570b3d82388ae7ccf54"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
17 16
diff --git a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
index 0ec426afb9..7f6fba995c 100644
--- a/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
+++ b/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb
@@ -135,9 +135,11 @@ RDEPENDS:${PN} = "hunspell"
135 135
136PV = "0.0.0+git" 136PV = "0.0.0+git"
137SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" 137SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee"
138SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" 138SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=main;protocol=https"
139
140# Upstream repo does not tag
141UPSTREAM_CHECK_COMMITS = "1"
139 142
140S = "${WORKDIR}/git"
141 143
142do_install() { 144do_install() {
143 for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do 145 for LANGUAGE in `ls -d1 ${S}/dictionaries/*` ; do
diff --git a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
index afe75472a5..67a51f5c9f 100644
--- a/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
+++ b/meta-oe/recipes-support/hunspell/hunspell_1.7.2.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = " \
9SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e" 9SRCREV = "2969be996acad84b91ab3875b1816636fe61a40e"
10SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https" 10SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https"
11 11
12S = "${WORKDIR}/git"
13 12
14inherit autotools pkgconfig gettext 13inherit autotools pkgconfig gettext
15 14
diff --git a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb b/meta-oe/recipes-support/hwdata/hwdata_0.383.bb
deleted file mode 100644
index cfa6ae0e45..0000000000
--- a/meta-oe/recipes-support/hwdata/hwdata_0.383.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1DESCRIPTION = "Hardware identification and configuration data"
2HOMEPAGE = "https://github.com/vcrhonek/hwdata"
3SECTION = "System/Base"
4
5LICENSE = "GPL-2.0-or-later | XFree86-1.0"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57"
7
8SRCREV = "229069b51b488bc776602d82315188cd1fbf4887"
9SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https"
10
11S = "${WORKDIR}/git"
12
13inherit allarch
14
15do_configure() {
16 ${S}/configure --datadir=${datadir} --libdir=${libdir}
17}
18
19do_compile[noexec] = "1"
20
21do_install() {
22 oe_runmake install DESTDIR=${D}
23}
24
25FILES:${PN} = "${libdir}/* \
26 ${datadir}/* "
diff --git a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
index 8218b08084..03eb7ccbf1 100644
--- a/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
+++ b/meta-oe/recipes-support/idevicerestore/idevicerestore_git.bb
@@ -13,5 +13,4 @@ PV = "1.0.1+git"
13SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7" 13SRCREV = "ecae6c6e8ca6b6bad080a1c73f10ffd0e67d75a7"
14SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master" 14SRC_URI = "git://github.com/libimobiledevice/idevicerestore;protocol=https;branch=master"
15 15
16S = "${WORKDIR}/git"
17inherit autotools pkgconfig 16inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch b/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
deleted file mode 100644
index 41fccc3ab0..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel/avoid-obsolete-gnutls-apis.patch
+++ /dev/null
@@ -1,55 +0,0 @@
1From 7136a908a056d0e36c89b6e1c39adff8ce2bb1d4 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Wed, 1 Nov 2017 13:17:34 -0700
4Subject: [PATCH] avoid obsolete gnutls apis
5
6The gnutls_*_set_priority() family of functions was marked deprecated
7in gnutls 2.12.x and removed completely in 3.5.x. These functions
8have been superceded by gnutls_priority_set_direct(), which was added
9in gnutls 2.2.0 (released 2007-12-14).
10
11Rather than simply update the custom gnutls_*_set_priority() calls to
12use gnutls_priority_set_direct(), drop the custom priority selection
13completely and use the recommended approach of letting gnutls pick a
14reasonable set of defaults.
15
16Upstream-Status: Pending
17
18Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
19---
20 src/tls-gnutls.c | 12 ++----------
21 1 file changed, 2 insertions(+), 10 deletions(-)
22
23diff --git a/src/tls-gnutls.c b/src/tls-gnutls.c
24index d7b7c91..749e9ef 100644
25--- a/src/tls-gnutls.c
26+++ b/src/tls-gnutls.c
27@@ -48,11 +48,6 @@ tls_pull (struct ikstls_data *data, char *buffer, size_t len)
28 static int
29 tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock)
30 {
31- const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
32- const int kx_priority[] = { GNUTLS_KX_RSA, 0 };
33- const int cipher_priority[] = { GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
34- const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
35- const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };
36 struct ikstls_data *data;
37 int ret;
38
39@@ -81,11 +76,8 @@ tls_handshake (struct ikstls_data **datap, ikstransport *trans, void *sock)
40 return IKS_NOMEM;
41 }
42
43- gnutls_protocol_set_priority (data->sess, protocol_priority);
44- gnutls_cipher_set_priority(data->sess, cipher_priority);
45- gnutls_compression_set_priority(data->sess, comp_priority);
46- gnutls_kx_set_priority(data->sess, kx_priority);
47- gnutls_mac_set_priority(data->sess, mac_priority);
48+ gnutls_set_default_priority (data->sess);
49+
50 gnutls_credentials_set (data->sess, GNUTLS_CRD_CERTIFICATE, data->cred);
51
52 gnutls_transport_set_push_function (data->sess, (gnutls_push_func) tls_push);
53--
541.9.1
55
diff --git a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch b/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
deleted file mode 100644
index 05accdd9c8..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel/fix-configure-option-parsing.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 17a5cf8f70b86d8a2195562e2d9dcccb4fa35c83 Mon Sep 17 00:00:00 2001
2From: Andre McCurdy <armccurdy@gmail.com>
3Date: Tue, 31 Oct 2017 20:05:58 -0700
4Subject: [PATCH] fix configure option parsing
5
6Don't over-write with_openssl etc by trying to set to $enablevar
7
8Upstream-Status: Pending
9
10Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
11---
12 configure.ac | 14 +++++++-------
13 1 file changed, 7 insertions(+), 7 deletions(-)
14
15diff --git a/configure.ac b/configure.ac
16index 82e6d2d..823e6c1 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -56,17 +56,17 @@ fi
20 dnl Options for overriding TLS checks
21 AC_ARG_WITH([openssl],
22 AS_HELP_STRING([--without-openssl],[disable checking for openssl]),
23- [with_openssl=$enableval],
24- [with_openssl=yes]
25+ [],
26+ [with_openssl=auto]
27 )
28 AC_ARG_WITH([gnutls],
29 AS_HELP_STRING([--without-gnutls],[disable checking for GNU TLS]),
30- [with_gnutls=$enableval],
31- [with_gnutls=yes]
32+ [],
33+ [with_gnutls=auto]
34 )
35
36 dnl Check OpenSSL
37-if test "x$with_openssl" = "xyes"; then
38+if test "x$with_openssl" != "xno"; then
39 PKG_CHECK_MODULES([OPENSSL], openssl >= 0.9.8, have_openssl=yes, have_openssl=no)
40 if test "x$have_openssl" = "xyes"; then
41 LIBOPENSSL_CFLAGS="$OPENSSL_CFLAGS"
42@@ -78,7 +78,7 @@ if test "x$with_openssl" = "xyes"; then
43 fi
44
45 dnl Check GNU TLS
46-if test "x$with_gnutls" = "xyes"; then
47+if test "x$with_gnutls" != "xno"; then
48 if test "x$have_openssl" != "xyes"; then
49 PKG_CHECK_MODULES([GNUTLS], gnutls >= 2.0.0, have_gnutls=yes, have_gnutls=no)
50 if test "x$have_gnutls" = "xyes"; then
51@@ -94,7 +94,7 @@ fi
52 dnl Option for overriding Python check
53 AC_ARG_ENABLE([python],
54 AS_HELP_STRING([--disable-python],[disable checking for Python bindings]),
55- [with_python=$enableval],
56+ [],
57 [with_python=yes]
58 )
59
60--
611.9.1
62
diff --git a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
deleted file mode 100644
index 017e7d26a6..0000000000
--- a/meta-oe/recipes-support/iksemel/iksemel_1.5.bb
+++ /dev/null
@@ -1,24 +0,0 @@
1SUMMARY = "Fast and portable XML parser and Jabber protocol library"
2HOMEPAGE = "https://github.com/meduketto/iksemel"
3SECTION = "libs"
4LICENSE = "LGPL-2.1-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
6
7SRCREV = "978b733462e41efd5db72bc9974cb3b0d1d5f6fa"
8PV = "1.5+git"
9
10SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \
11 file://fix-configure-option-parsing.patch \
12 file://avoid-obsolete-gnutls-apis.patch"
13
14S = "${WORKDIR}/git"
15
16inherit autotools pkgconfig lib_package texinfo
17
18# TLS support requires either openssl or gnutls (if both are enabled openssl will be used).
19PACKAGECONFIG ?= "gnutls"
20
21PACKAGECONFIG[gnutls] = "--with-gnutls,--without-gnutls,gnutls"
22PACKAGECONFIG[openssl] = "--with-openssl,--without-openssl,openssl"
23
24EXTRA_OECONF = "--disable-python"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
new file mode 100644
index 0000000000..10d2150998
--- /dev/null
+++ b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1-43.bb
@@ -0,0 +1,183 @@
1SUMMARY = "ImageMagick is an image conversion toolkit"
2SECTION = "console/utils"
3HOMEPAGE = "https://www.imagemagick.org/"
4DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
5editing raster and vector image files. It can read and write over 200 image file formats."
6LICENSE = "ImageMagick"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \
8 file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
9# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
10DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
11
12BASE_PV = "${@d.getVar('PV').split('-')[0]}"
13UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>([0-9][\.|_|-]?)+)"
14
15SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
16SRCREV = "a2d96f40e707ba54b57e7d98c3277d3ea6611ace"
17
18
19inherit autotools pkgconfig update-alternatives
20export ac_cv_sys_file_offset_bits = "64"
21
22EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile"
23
24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml"
25PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"
26PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz"
27PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
28PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
29PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
30PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
31PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
32PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
33PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
34PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
35PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
36PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
37
38do_install:append:class-target() {
39 for file in MagickCore-config.im7 MagickWand-config.im7; do
40 sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/$file"
41 done
42
43 if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then
44 sed -i 's,${STAGING_DIR_TARGET},,g' "${D}${bindir}/Magick++-config.im7"
45 fi
46
47 if ${@bb.utils.contains('PACKAGECONFIG', 'xml', 'true', 'false', d)}; then
48 xml_config="${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml"
49 sed -i 's,${S},,g' "$xml_config"
50 sed -i 's,${B},,g' "$xml_config"
51 sed -i 's,${RECIPE_SYSROOT},,g' "$xml_config"
52 fi
53
54 if ${@bb.utils.contains_any('PACKAGECONFIG', 'webp openjpeg', 'true', 'false', d)}; then
55 sed -i 's,${HOSTTOOLS_DIR},${bindir},g' "${D}${sysconfdir}/ImageMagick-7/delegates.xml"
56 fi
57}
58
59FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
60 ${datadir}/ImageMagick-7"
61
62FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a"
63
64FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*"
65
66BBCLASSEXTEND = "native nativesdk"
67
68ALTERNATIVE_PRIORITY = "100"
69
70ALTERNATIVE:${PN} = "animate compare composite conjure convert display \
71 identify import magick-script mogrify montage stream"
72
73ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7"
74ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7"
75ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7"
76ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7"
77ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7"
78ALTERNATIVE_TARGET[display] = "${bindir}/display.im7"
79ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7"
80ALTERNATIVE_TARGET[import] = "${bindir}/import.im7"
81ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7"
82ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7"
83ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7"
84ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7"
85
86ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \
87 convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1"
88
89ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1"
90ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1"
91ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1"
92ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1"
93ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1"
94ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1"
95ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1"
96ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1"
97ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1"
98ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1"
99ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1"
100ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1"
101ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1"
102ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1"
103ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1"
104ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1"
105ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1"
106ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1"
107ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1"
108ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1"
109ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1"
110ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1"
111ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1"
112ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1"
113
114CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick"
115CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
116CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
117CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
118CVE_STATUS[CVE-2014-9807] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
119CVE_STATUS[CVE-2014-9808] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
120CVE_STATUS[CVE-2014-9809] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
121CVE_STATUS[CVE-2014-9810] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
122CVE_STATUS[CVE-2014-9811] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
123CVE_STATUS[CVE-2014-9812] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
124CVE_STATUS[CVE-2014-9813] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
125CVE_STATUS[CVE-2014-9814] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
126CVE_STATUS[CVE-2014-9815] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
127CVE_STATUS[CVE-2014-9816] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
128CVE_STATUS[CVE-2014-9817] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
129CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
130CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
131CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
132CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
133CVE_STATUS[CVE-2014-9822] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
134CVE_STATUS[CVE-2014-9823] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
135CVE_STATUS[CVE-2014-9824] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
136CVE_STATUS[CVE-2014-9825] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
137CVE_STATUS[CVE-2014-9826] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
138CVE_STATUS[CVE-2014-9827] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
139CVE_STATUS[CVE-2014-9828] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
140CVE_STATUS[CVE-2014-9829] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
141CVE_STATUS[CVE-2014-9830] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
142CVE_STATUS[CVE-2014-9831] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
143CVE_STATUS[CVE-2014-9848] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
144CVE_STATUS[CVE-2014-9852] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
145CVE_STATUS[CVE-2014-9853] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
146CVE_STATUS[CVE-2014-9854] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
147CVE_STATUS[CVE-2014-9907] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
148CVE_STATUS[CVE-2016-10062] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-10"
149CVE_STATUS[CVE-2016-10144] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1"
150CVE_STATUS[CVE-2016-10145] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.7-1"
151CVE_STATUS[CVE-2016-10146] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.6-8"
152CVE_STATUS[CVE-2016-5118] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-7"
153CVE_STATUS[CVE-2016-7513] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
154CVE_STATUS[CVE-2016-7514] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
155CVE_STATUS[CVE-2016-7515] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
156CVE_STATUS[CVE-2016-7516] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
157CVE_STATUS[CVE-2016-7517] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
158CVE_STATUS[CVE-2016-7518] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
159CVE_STATUS[CVE-2016-7519] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
160CVE_STATUS[CVE-2016-7520] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
161CVE_STATUS[CVE-2016-7521] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
162CVE_STATUS[CVE-2016-7522] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
163CVE_STATUS[CVE-2016-7523] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
164CVE_STATUS[CVE-2016-7524] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
165CVE_STATUS[CVE-2016-7525] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
166CVE_STATUS[CVE-2016-7526] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
167CVE_STATUS[CVE-2016-7527] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
168CVE_STATUS[CVE-2016-7528] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
169CVE_STATUS[CVE-2016-7529] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
170CVE_STATUS[CVE-2016-7530] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
171CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
172CVE_STATUS[CVE-2016-7532] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
173CVE_STATUS[CVE-2016-7533] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
174CVE_STATUS[CVE-2016-7534] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
175CVE_STATUS[CVE-2016-7535] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
176CVE_STATUS[CVE-2016-7536] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
177CVE_STATUS[CVE-2016-7537] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
178CVE_STATUS[CVE-2016-7538] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
179CVE_STATUS[CVE-2017-5506] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
180CVE_STATUS[CVE-2017-5509] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
181CVE_STATUS[CVE-2017-5510] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-4"
182CVE_STATUS[CVE-2017-5511] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.4-3"
183CVE_STATUS[CVE-2023-5341] = "fixed-version: this is fixed in 7.1.1-19"
diff --git a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb
deleted file mode 100644
index 61dc1b795e..0000000000
--- a/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb
+++ /dev/null
@@ -1,121 +0,0 @@
1SUMMARY = "ImageMagick is an image conversion toolkit"
2SECTION = "console/utils"
3HOMEPAGE = "https://www.imagemagick.org/"
4DESCRIPTION = "ImageMagick is a collection of tools for displaying, converting, and \
5editing raster and vector image files. It can read and write over 200 image file formats."
6LICENSE = "ImageMagick"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=2f9de66264141265b203cde9902819ea \
8 file://NOTICE;md5=bcbf1f1897b40ec8df39700cb560e9ed"
9# FIXME: There are many more checked libraries. All should be added or explicitly disabled to get consistent results.
10DEPENDS = "lcms bzip2 jpeg libpng tiff zlib fftw freetype libtool"
11
12BASE_PV := "${PV}"
13PV .= "-26"
14SRC_URI = "git://github.com/ImageMagick/ImageMagick.git;branch=main;protocol=https"
15SRCREV = "570a9a048bb0e3a5c221ca87be9408ae35f711e2"
16
17S = "${WORKDIR}/git"
18
19inherit autotools pkgconfig update-alternatives
20export ac_cv_sys_file_offset_bits="64"
21
22EXTRA_OECONF = "--program-prefix= --program-suffix=.im7 --without-perl --enable-largefile"
23
24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} cxx webp xml"
25PACKAGECONFIG[cxx] = "--with-magick-plus-plus,--without-magick-plus-plus"
26PACKAGECONFIG[graphviz] = "--with-gvc,--without-gvc,graphviz"
27PACKAGECONFIG[jp2] = "--with-jp2,,jasper"
28PACKAGECONFIG[lzma] = "--with-lzma,--without-lzma,xz"
29PACKAGECONFIG[openjpeg] = "--with-openjp2,--without-openjp2,openjpeg"
30PACKAGECONFIG[pango] = "--with-pango,--without-pango,pango cairo"
31PACKAGECONFIG[rsvg] = "--with-rsvg,--without-rsvg,librsvg"
32PACKAGECONFIG[tcmalloc] = "--with-tcmalloc=yes,--with-tcmalloc=no,gperftools"
33PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp"
34PACKAGECONFIG[wmf] = "--with-wmf,--without-wmf,libwmf"
35PACKAGECONFIG[x11] = "--with-x,--without-x,virtual/libx11 libxext libxt"
36PACKAGECONFIG[xml] = "--with-xml,--without-xml,libxml2"
37
38do_install:append:class-target() {
39 for file in MagickCore-config.im7 MagickWand-config.im7 Magick++-config.im7; do
40 sed -i 's,${STAGING_DIR_TARGET},,g' ${D}${bindir}/"$file"
41 done
42 sed -i 's,${S},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
43 sed -i 's,${B},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
44 sed -i 's,${RECIPE_SYSROOT},,g' ${D}${libdir}/ImageMagick-${BASE_PV}/config-Q16HDRI/configure.xml
45 sed -i 's,${HOSTTOOLS_DIR},${bindir},g' ${D}${sysconfdir}/ImageMagick-7/delegates.xml
46}
47
48FILES:${PN} += "${libdir}/ImageMagick-${BASE_PV}/config-Q16* \
49 ${datadir}/ImageMagick-7"
50
51FILES:${PN}-dev += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/*.a"
52
53FILES:${PN}-dbg += "${libdir}/ImageMagick-${BASE_PV}/modules-Q16/*/.debug/*"
54
55BBCLASSEXTEND = "native nativesdk"
56
57ALTERNATIVE_PRIORITY = "100"
58
59ALTERNATIVE:${PN} = "animate compare composite conjure convert display \
60 identify import magick-script mogrify montage stream"
61
62ALTERNATIVE_TARGET[animate] = "${bindir}/animate.im7"
63ALTERNATIVE_TARGET[compare] = "${bindir}/compare.im7"
64ALTERNATIVE_TARGET[composite] = "${bindir}/composite.im7"
65ALTERNATIVE_TARGET[conjure] = "${bindir}/conjure.im7"
66ALTERNATIVE_TARGET[convert] = "${bindir}/convert.im7"
67ALTERNATIVE_TARGET[display] = "${bindir}/display.im7"
68ALTERNATIVE_TARGET[identify] = "${bindir}/identify.im7"
69ALTERNATIVE_TARGET[import] = "${bindir}/import.im7"
70ALTERNATIVE_TARGET[magick-script] = "${bindir}/magick-script.im7"
71ALTERNATIVE_TARGET[mogrify] = "${bindir}/mogrify.im7"
72ALTERNATIVE_TARGET[montage] = "${bindir}/montage.im7"
73ALTERNATIVE_TARGET[stream] = "${bindir}/stream.im7"
74
75ALTERNATIVE:${PN}-doc = "animate.1 compare.1 composite.1 conjure.1 \
76 convert.1 display.1 identify.1 import.1 magick-script.1 mogrify.1 montage.1 stream.1"
77
78ALTERNATIVE_LINK_NAME[animate.1] = "${mandir}/man1/animate.1"
79ALTERNATIVE_TARGET[animate.1] = "${mandir}/man1/animate.im7.1"
80ALTERNATIVE_LINK_NAME[compare.1] = "${mandir}/man1/compare.1"
81ALTERNATIVE_TARGET[compare.1] = "${mandir}/man1/compare.im7.1"
82ALTERNATIVE_LINK_NAME[composite.1] = "${mandir}/man1/composite.1"
83ALTERNATIVE_TARGET[composite.1] = "${mandir}/man1/composite.im7.1"
84ALTERNATIVE_LINK_NAME[conjure.1] = "${mandir}/man1/conjure.1"
85ALTERNATIVE_TARGET[conjure.1] = "${mandir}/man1/conjure.im7.1"
86ALTERNATIVE_LINK_NAME[convert.1] = "${mandir}/man1/convert.1"
87ALTERNATIVE_TARGET[convert.1] = "${mandir}/man1/convert.im7.1"
88ALTERNATIVE_LINK_NAME[display.1] = "${mandir}/man1/display.1"
89ALTERNATIVE_TARGET[display.1] = "${mandir}/man1/display.im7.1"
90ALTERNATIVE_LINK_NAME[identify.1] = "${mandir}/man1/identify.1"
91ALTERNATIVE_TARGET[identify.1] = "${mandir}/man1/identify.im7.1"
92ALTERNATIVE_LINK_NAME[import.1] = "${mandir}/man1/import.1"
93ALTERNATIVE_TARGET[import.1] = "${mandir}/man1/import.im7.1"
94ALTERNATIVE_LINK_NAME[magick-script.1] = "${mandir}/man1/magick-script.1"
95ALTERNATIVE_TARGET[magick-script.1] = "${mandir}/man1/magick-script.im7.1"
96ALTERNATIVE_LINK_NAME[mogrify.1] = "${mandir}/man1/mogrify.1"
97ALTERNATIVE_TARGET[mogrify.1] = "${mandir}/man1/mogrify.im7.1"
98ALTERNATIVE_LINK_NAME[montage.1] = "${mandir}/man1/montage.1"
99ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1"
100ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1"
101ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1"
102
103CVE_STATUS[CVE-2014-9804] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
104CVE_STATUS[CVE-2014-9805] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
105CVE_STATUS[CVE-2014-9806] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
106CVE_STATUS[CVE-2014-9807] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
107CVE_STATUS[CVE-2014-9808] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
108CVE_STATUS[CVE-2014-9809] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
109CVE_STATUS[CVE-2014-9810] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
110CVE_STATUS[CVE-2014-9811] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
111CVE_STATUS[CVE-2014-9812] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
112CVE_STATUS[CVE-2014-9813] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
113CVE_STATUS[CVE-2014-9814] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
114CVE_STATUS[CVE-2014-9815] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
115CVE_STATUS[CVE-2014-9816] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
116CVE_STATUS[CVE-2014-9817] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
117CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
118CVE_STATUS[CVE-2014-9819] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
119CVE_STATUS[CVE-2014-9820] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
120CVE_STATUS[CVE-2014-9821] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 6.9.4-0"
121CVE_STATUS[CVE-2016-7531] = "cpe-incorrect: The current version (7.1.1) is not affected by the CVE which affects versions at least earlier than 7.0.1-0"
diff --git a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb
index 422d96359c..f4905e3c0b 100644
--- a/meta-oe/recipes-support/imapfilter/imapfilter_2.8.2.bb
+++ b/meta-oe/recipes-support/imapfilter/imapfilter_2.8.3.bb
@@ -3,13 +3,12 @@ LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=f8d2fc4954306888fd0e4b27bef83525"
4 4
5# v2.7.6 5# v2.7.6
6SRCREV = "9e6661278572009a92a8e125c9b339232a9735a1" 6SRCREV = "72f7fa621357299bb6c8f5d29b4efbafcbd34bf7"
7SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master \ 7SRC_URI = "git://github.com/lefcha/imapfilter;protocol=https;branch=master;tag=v${PV} \
8 file://ldflags.patch \ 8 file://ldflags.patch \
9" 9"
10S = "${WORKDIR}/git"
11 10
12DEPENDS= "openssl lua libpcre2" 11DEPENDS = "openssl lua libpcre2"
13 12
14EXTRA_OEMAKE:append = " PREFIX=${prefix}" 13EXTRA_OEMAKE:append = " PREFIX=${prefix}"
15 14
diff --git a/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch b/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch
new file mode 100644
index 0000000000..ce7626ab31
--- /dev/null
+++ b/meta-oe/recipes-support/imx-cst/imx-cst/0001-fix-missing-makefile-rule-dependency.patch
@@ -0,0 +1,45 @@
1From 73509cb22ffab827dc3e3ccda2781683b8e8296d Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Mon, 2 Jun 2025 11:07:08 +0200
4Subject: [PATCH] fix missing makefile rule dependency
5
6During, the package build with an high CPU load we can face
7a build failed issue, caused by the header file cst_parser.h not present
8when compiling cst_lexer.c, which depend on cst_parser.h:
9| x86_64-poky-linux-gcc ... -c cst_lexer.c -o cst_lexer.d
10| ../../code/front_end/src/cst_lexer.l:21:10: fatal error:
11|cst_parser.h: No such file or directory
12| 21 | #include "cst_parser.h"
13| | ^~~~~~~~~~~~~~
14| compilation terminated.
15
16The file cst_parser.h is generated during compilation
17by a makefile rule which also generate cst_parser.c
18
19To fix the issue, makefile rule needed to be update
20in order for compilation of cst_lexer.c to be done,
21always after the generation of cst_parser.h and .c
22
23Upstream-Status: Submitted [https://community.nxp.com/t5/Other-NXP-Products/Package-imx-code-signing-tool-3-4-0-dfsg-2-build-issue/m-p/2108575#M28853]
24
25Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
26---
27 code/build/make/rules.mk | 5 +++++
28 1 file changed, 5 insertions(+)
29
30diff --git a/code/build/make/rules.mk b/code/build/make/rules.mk
31index 7720e4b..239108b 100644
32--- a/code/build/make/rules.mk
33+++ b/code/build/make/rules.mk
34@@ -35,6 +35,11 @@ LFLAGS := -t
35 @echo "Link $@"
36 $(LD) $^ $(LDFLAGS) -o $@
37
38+# Compilation of cst_lexer.c require cst_parser.h
39+# (cst_lexer.c include cst_parser.h) which is generated
40+# by the same makefile genrating cst_parser.c
41+cst_lexer.o: cst_parser.c
42+
43 %.o: %.c
44 @echo "Compile $@"
45 # generate dependency file
diff --git a/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb
new file mode 100644
index 0000000000..3b57f4ed81
--- /dev/null
+++ b/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb
@@ -0,0 +1,40 @@
1SUMMARY = "i.MX code signing tool"
2DESCRIPTION = "Code signing support that integrates the HABv4 and AHAB library for i.MX processors"
3LICENSE = "BSD-3-Clause & Apache-2.0"
4
5LIC_FILES_CHKSUM = "\
6 file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \
7 file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \
8 file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \
9"
10
11DEPENDS = "byacc-native flex-native openssl"
12
13# debian: 3.4.0+dfsg-2
14DEBIAN_PGK_NAME = "imx-code-signing-tool"
15DEBIAN_PGK_VERSION = "${PV}+dfsg"
16
17SRC_URI = "\
18 ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \
19 file://0001-fix-missing-makefile-rule-dependency.patch \
20"
21
22SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d"
23
24S = "${UNPACKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}"
25
26EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"'
27
28do_compile() {
29 oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}"
30 oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}"
31}
32
33do_install () {
34 install -d ${D}${bindir}
35 install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/
36 install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir}
37 install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir}
38}
39
40BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/inih/libinih_58.bb b/meta-oe/recipes-support/inih/libinih_58.bb
index 2bcf2b4bd4..0ebeec6851 100644
--- a/meta-oe/recipes-support/inih/libinih_58.bb
+++ b/meta-oe/recipes-support/inih/libinih_58.bb
@@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7a95d2af90376e85a05318794e6f202"
8 8
9SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master" 9SRC_URI = "git://github.com/benhoyt/inih.git;protocol=https;branch=master"
10 10
11S = "${WORKDIR}/git"
12SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e" 11SRCREV = "5cc5e2c24642513aaa5b19126aad42d0e4e0923e"
13 12
14inherit meson pkgconfig 13inherit meson pkgconfig
diff --git a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-oe/recipes-support/iniparser/iniparser_4.2.6.bb
index 8c6c60a79a..9ab713ee92 100644
--- a/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb
+++ b/meta-oe/recipes-support/iniparser/iniparser_4.2.6.bb
@@ -4,10 +4,9 @@ HOMEPAGE = "https://gitlab.com/iniparser/iniparser"
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678"
6SRCBRANCH = "main" 6SRCBRANCH = "main"
7SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" 7SRCREV = "4bef811283e0ec1658c60e09950bd5a1ddc92e4b"
8 8
9SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" 9SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}"
10S = "${WORKDIR}/git"
11 10
12inherit cmake 11inherit cmake
13 12
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
deleted file mode 100644
index 3b195aae4f..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 6a57ff26d695aaad096b798879a5dbc5af2cedf5 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 20 Dec 2022 10:46:50 -0800
4Subject: [PATCH] configure: Add AC_SYS_LARGEFILE autoconf macro
5
6This will define _FILE_OFFSET_BITS to be 64 if off_t is 64bit
7and we do not need to define lfs64 functions
8
9Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 configure.ac | 3 +++
13 1 file changed, 3 insertions(+)
14
15diff --git a/configure.ac b/configure.ac
16index bddf14d..b89a266 100644
17--- a/configure.ac
18+++ b/configure.ac
19@@ -17,6 +17,9 @@ AC_PROG_CC
20 AM_INIT_AUTOMAKE
21 LT_INIT
22
23+# Add option for largefile support
24+AC_SYS_LARGEFILE
25+
26 AC_PATH_PROG(DOXYGEN, doxygen, NO_DOXYGEN)
27
28 AC_ARG_ENABLE(doxygen,
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
deleted file mode 100644
index 931244830c..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0002-libinotifytools-Bridge-differences-between-musl-glib.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 6c3ce01a281a9aa661494d24a862219fc9e2b460 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 16 Dec 2021 14:57:55 -0800
4Subject: [PATCH 2/2] libinotifytools: Bridge differences between
5 musl/glibc/kernel fnotify.h
6
7System detects to use sys/fnotify.h and then assumes glibc's definitions
8but musl has definitions of its own. perhaps portable thing would be to
9use linux/fnotify.h interface directly on linux irrespective of libc
10
11See the differences discussion here [1]
12
13[1] https://inbox.vuxu.org/musl/20191112220151.GC27331@x230/T/#ma8700992467200c8792e0fa8508eae656b81aeba
14
15Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/154]
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 libinotifytools/src/inotifytools.c | 6 ++++++
19 1 file changed, 6 insertions(+)
20
21diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
22index 902eac2..2b96395 100644
23--- a/libinotifytools/src/inotifytools.c
24+++ b/libinotifytools/src/inotifytools.c
25@@ -55,6 +55,12 @@ struct fanotify_event_fid {
26 struct fanotify_event_info_fid info;
27 struct file_handle handle;
28 };
29+
30+#ifndef __GLIBC__
31+#define val __val
32+#define __kernel_fsid_t fsid_t
33+#endif
34+
35 #endif
36
37 /**
38--
392.34.1
40
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch b/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
deleted file mode 100644
index c0784ecc73..0000000000
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools/0003-replace-stat64-lstat64-with-stat-lstat.patch
+++ /dev/null
@@ -1,119 +0,0 @@
1From c6093ad63b92f5d25e6826d1c49dc7cee86d3747 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 20 Dec 2022 10:48:10 -0800
4Subject: [PATCH] replace stat64/lstat64 with stat/lstat
5
6lfs64 functions are not needed when off_t is 64-bit
7Additionally this fixes build with musl which does not
8export these functions without defining _LARGEFILE64_SOURCE
9
10Upstream-Status: Submitted [https://github.com/inotify-tools/inotify-tools/pull/174]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 libinotifytools/src/inotifytools.c | 8 ++++----
14 libinotifytools/src/inotifytools/inotify-nosys.h | 5 -----
15 libinotifytools/src/inotifytools/inotifytools.h | 5 -----
16 src/common.c | 4 ++--
17 src/common.h | 6 +-----
18 5 files changed, 7 insertions(+), 21 deletions(-)
19
20diff --git a/libinotifytools/src/inotifytools.c b/libinotifytools/src/inotifytools.c
21index 50f6135..3e17ac6 100644
22--- a/libinotifytools/src/inotifytools.c
23+++ b/libinotifytools/src/inotifytools.c
24@@ -1750,14 +1750,14 @@ int inotifytools_watch_recursively_with_exclude(char const* path,
25
26 static struct dirent * ent;
27 char * next_file;
28- static struct stat64 my_stat;
29+ static struct stat my_stat;
30 ent = readdir( dir );
31 // Watch each directory within this directory
32 while ( ent ) {
33 if ( (0 != strcmp( ent->d_name, "." )) &&
34 (0 != strcmp( ent->d_name, ".." )) ) {
35 nasprintf(&next_file,"%s%s", my_path, ent->d_name);
36- if ( -1 == lstat64( next_file, &my_stat ) ) {
37+ if ( -1 == lstat( next_file, &my_stat ) ) {
38 error = errno;
39 free( next_file );
40 if ( errno != EACCES ) {
41@@ -1840,9 +1840,9 @@ int inotifytools_error() {
42 * @internal
43 */
44 static int isdir( char const * path ) {
45- static struct stat64 my_stat;
46+ static struct stat my_stat;
47
48- if ( -1 == lstat64( path, &my_stat ) ) {
49+ if ( -1 == lstat( path, &my_stat ) ) {
50 if (errno == ENOENT) return 0;
51 fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
52 return 0;
53diff --git a/libinotifytools/src/inotifytools/inotify-nosys.h b/libinotifytools/src/inotifytools/inotify-nosys.h
54index 01aa45e..97166d4 100644
55--- a/libinotifytools/src/inotifytools/inotify-nosys.h
56+++ b/libinotifytools/src/inotifytools/inotify-nosys.h
57@@ -13,11 +13,6 @@
58 #include <sys/syscall.h>
59 #include <unistd.h>
60
61-#ifdef __FreeBSD__
62-#define stat64 stat
63-#define lstat64 lstat
64-#endif
65-
66 /*
67 * struct inotify_event - structure read from the inotify device for each event
68 *
69diff --git a/libinotifytools/src/inotifytools/inotifytools.h b/libinotifytools/src/inotifytools/inotifytools.h
70index 49936ae..2ec4358 100644
71--- a/libinotifytools/src/inotifytools/inotifytools.h
72+++ b/libinotifytools/src/inotifytools/inotifytools.h
73@@ -1,11 +1,6 @@
74 #ifndef _inotifytools_H
75 #define _inotifytools_H
76
77-#ifdef __FreeBSD__
78-#define stat64 stat
79-#define lstat64 lstat
80-#endif
81-
82 #ifdef __cplusplus
83 extern "C"
84 {
85diff --git a/src/common.c b/src/common.c
86index 5a6fda1..885286e 100644
87--- a/src/common.c
88+++ b/src/common.c
89@@ -45,9 +45,9 @@ void print_event_descriptions() {
90 }
91
92 int isdir(char const *path) {
93- static struct stat64 my_stat;
94+ static struct stat my_stat;
95
96- if (-1 == lstat64(path, &my_stat)) {
97+ if (-1 == lstat(path, &my_stat)) {
98 if (errno == ENOENT)
99 return 0;
100 fprintf(stderr, "Stat failed on %s: %s\n", path, strerror(errno));
101diff --git a/src/common.h b/src/common.h
102index 12d3dde..7f1e34a 100644
103--- a/src/common.h
104+++ b/src/common.h
105@@ -1,13 +1,9 @@
106 #ifndef COMMON_H
107 #define COMMON_H
108
109-#ifdef __FreeBSD__
110-#define stat64 stat
111-#define lstat64 lstat
112-#ifdef ENABLE_FANOTIFY
113+#if defined(__FreeBSD__) && defined(ENABLE_FANOTIFY)
114 #error "FreeBSD does not support fanotify"
115 #endif
116-#endif
117
118 #include <stdbool.h>
119
diff --git a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
index 8a0ae17ad7..cb77dc81b0 100644
--- a/meta-oe/recipes-support/inotify-tools/inotify-tools_3.22.6.0.bb
+++ b/meta-oe/recipes-support/inotify-tools/inotify-tools_4.23.9.0.bb
@@ -4,15 +4,11 @@ SECTION = "console/devel"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6" 5LIC_FILES_CHKSUM = "file://COPYING;md5=ac6c26e52aea428ee7f56dc2c56424c6"
6 6
7SRCREV = "c8bdbc0a2ed822fc7c67c5c3e102d89fe27fb2d0" 7SRCREV = "5c2ab772338bcbe516306bf8cf1059ddf2fa6bb7"
8 8
9SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \ 9SRC_URI = "git://github.com/${BPN}/${BPN};branch=master;protocol=https \
10 file://0002-libinotifytools-Bridge-differences-between-musl-glib.patch \
11 file://0002-configure-Add-AC_SYS_LARGEFILE-autoconf-macro.patch \
12 file://0003-replace-stat64-lstat64-with-stat-lstat.patch \
13 " 10 "
14 11
15S = "${WORKDIR}/git"
16 12
17inherit autotools 13inherit autotools
18 14
diff --git a/meta-oe/recipes-support/joe/joe_4.6.bb b/meta-oe/recipes-support/joe/joe_4.6.bb
index ed0bf337b5..510d8f8498 100644
--- a/meta-oe/recipes-support/joe/joe_4.6.bb
+++ b/meta-oe/recipes-support/joe/joe_4.6.bb
@@ -11,5 +11,4 @@ PACKAGECONFIG[curses] = "--enable-curses,--disable-curses,ncurses,ncurses-termin
11 11
12inherit autotools-brokensep mime-xdg 12inherit autotools-brokensep mime-xdg
13 13
14SRC_URI[md5sum] = "9017484e6116830d846678b625ea5c43"
15SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de" 14SRC_URI[sha256sum] = "495a0a61f26404070fe8a719d80406dc7f337623788e445b92a9f6de512ab9de"
diff --git a/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb b/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb
new file mode 100644
index 0000000000..314f67928a
--- /dev/null
+++ b/meta-oe/recipes-support/jsoncons/jsoncons_1.3.2.bb
@@ -0,0 +1,14 @@
1DESCRIPTION = "A C++, header-only library for constructing JSON and JSON-like data formats."
2HOMEPAGE = "https://github.com/danielaparker/jsoncons"
3
4LICENSE = "BSL-1.0"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=6ee7f7ed2001e4cde4679fdb8926f820"
6
7SRC_URI = "git://github.com/danielaparker/jsoncons.git;protocol=https;branch=master;tag=v${PV}"
8SRCREV = "64b9da1e9f15eeff4ec9d6bc856538db542118f2"
9
10
11inherit cmake
12
13PACKAGECONFIG ??= ""
14PACKAGECONFIG[tests] = "-DJSONCONS_BUILD_TESTS=ON,-DJSONCONS_BUILD_TESTS=OFF"
diff --git a/meta-oe/recipes-support/lcms/lcms_2.16.bb b/meta-oe/recipes-support/lcms/lcms_2.16.bb
index 8135f83a05..87b0979200 100644
--- a/meta-oe/recipes-support/lcms/lcms_2.16.bb
+++ b/meta-oe/recipes-support/lcms/lcms_2.16.bb
@@ -10,7 +10,7 @@ DEPENDS = "tiff"
10 10
11BBCLASSEXTEND = "native nativesdk" 11BBCLASSEXTEND = "native nativesdk"
12 12
13S = "${WORKDIR}/lcms2-${PV}" 13S = "${UNPACKDIR}/lcms2-${PV}"
14 14
15inherit autotools 15inherit autotools
16 16
diff --git a/meta-oe/recipes-support/lcov/lcov_1.16.bb b/meta-oe/recipes-support/lcov/lcov_1.16.bb
index 22d68814ee..a889b3fa82 100755
--- a/meta-oe/recipes-support/lcov/lcov_1.16.bb
+++ b/meta-oe/recipes-support/lcov/lcov_1.16.bb
@@ -9,13 +9,13 @@ LICENSE = "GPL-2.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 9LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
10 10
11RDEPENDS:${PN} += " \ 11RDEPENDS:${PN} += " \
12 libjson-perl \
12 perl \ 13 perl \
13 perl-module-filehandle \ 14 perl-module-compress-zlib \
14 perl-module-getopt-std \
15 perl-module-digest-md5 \
16 perl-module-digest-sha \
17 perl-module-constant \ 15 perl-module-constant \
18 perl-module-cwd \ 16 perl-module-cwd \
17 perl-module-digest-md5 \
18 perl-module-digest-sha \
19 perl-module-errno \ 19 perl-module-errno \
20 perl-module-file-basename \ 20 perl-module-file-basename \
21 perl-module-file-copy \ 21 perl-module-file-copy \
@@ -25,12 +25,16 @@ RDEPENDS:${PN} += " \
25 perl-module-file-spec-functions \ 25 perl-module-file-spec-functions \
26 perl-module-file-spec-unix \ 26 perl-module-file-spec-unix \
27 perl-module-file-temp \ 27 perl-module-file-temp \
28 perl-module-filehandle \
28 perl-module-getopt-long \ 29 perl-module-getopt-long \
30 perl-module-getopt-std \
29 perl-module-list-util \ 31 perl-module-list-util \
32 perl-module-load \
33 perl-module-metadata \
30 perl-module-mro \ 34 perl-module-mro \
31 perl-module-overload \ 35 perl-module-overload \
32 perl-module-overloading \
33 perl-module-overload-numbers \ 36 perl-module-overload-numbers \
37 perl-module-overloading \
34 perl-module-parent \ 38 perl-module-parent \
35 perl-module-pod-usage \ 39 perl-module-pod-usage \
36 perl-module-posix \ 40 perl-module-posix \
@@ -47,9 +51,11 @@ RDEPENDS:${PN}:append:class-target = " \
47 gcov-symlinks \ 51 gcov-symlinks \
48" 52"
49SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz" 53SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/lcov-${PV}.tar.gz"
50SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef"
51SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" 54SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b"
52 55
56UPSTREAM_CHECK_URI = "https://github.com/linux-test-project/lcov/releases"
57UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
58
53do_install() { 59do_install() {
54 oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" 60 oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl"
55} 61}
diff --git a/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb
new file mode 100644
index 0000000000..344bf119b9
--- /dev/null
+++ b/meta-oe/recipes-support/lgi/lua-lgi_0.9.2.bb
@@ -0,0 +1,29 @@
1SUMMARY = "LGI is gobject-introspection based dynamic Lua binding to GObject based libraries."
2HOMEPAGE = "https://https://github.com/pavouk/lgi"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=a77b7838f84aa753d37f88fd9c9ccf7d"
5
6SRC_URI = "git://github.com/pavouk/lgi.git;protocol=https;branch=master"
7
8DEPENDS = " \
9 luajit \
10 luajit-native \
11 cairo \
12 gobject-introspection \
13 gobject-introspection-native \
14"
15
16SRCREV = "d7666f77e7ee33907c84f5efdef32aef2e1cc196"
17SRCPV = "${PV}+${SRCREV}"
18
19inherit meson pkgconfig
20
21EXTRA_OEMESON += "--buildtype release -Dtests=false"
22
23FILES:${PN} = "${libdir} ${datadir}"
24
25# ppc64/riscv64/riscv32 is not supported on luajit
26COMPATIBLE_HOST:riscv32 = "null"
27COMPATIBLE_HOST:riscv64 = "null"
28COMPATIBLE_HOST:powerpc64 = "null"
29COMPATIBLE_HOST:powerpc64le = "null"
diff --git a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
index f747ecbf72..89b2dff0ba 100644
--- a/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
+++ b/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1"
5DEPENDS = "udev" 5DEPENDS = "udev"
6 6
7SRCREV = "de6258940960443038b4c1651dfda3620075e870" 7SRCREV = "de6258940960443038b4c1651dfda3620075e870"
8SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ 8SRC_URI = "git://git.0pointer.net/libatasmart.git;protocol=http;branch=master \
9 file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ 9 file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \
10" 10"
11 11
12S = "${WORKDIR}/git"
13 12
14inherit autotools lib_package pkgconfig 13inherit autotools lib_package pkgconfig
15 14
diff --git a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
index e0683b177b..4a1052e75b 100644
--- a/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
+++ b/meta-oe/recipes-support/libb64/libb64_2.0.0.1.bb
@@ -16,7 +16,6 @@ SRC_URI = "git://github.com/libb64/libb64;protocol=https;branch=master \
16 file://0001-examples-Use-proper-function-prototype-for-main.patch \ 16 file://0001-examples-Use-proper-function-prototype-for-main.patch \
17 " 17 "
18 18
19S = "${WORKDIR}/git"
20 19
21CFLAGS += "-fPIC" 20CFLAGS += "-fPIC"
22 21
diff --git a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
index daa01bfc3d..ef2a6c76fb 100644
--- a/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb
+++ b/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb
@@ -6,9 +6,8 @@ SECTION = "devel/lib"
6 6
7LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c"
8 8
9S = "${WORKDIR}/git"
10 9
11SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" 10SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2"
12SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" 11SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https"
13 12
14inherit gettext autotools pkgconfig python3native 13inherit gettext autotools pkgconfig python3native
diff --git a/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch b/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch
new file mode 100644
index 0000000000..b8ad041850
--- /dev/null
+++ b/meta-oe/recipes-support/libcanberra/files/0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch
@@ -0,0 +1,42 @@
1From 86488a7fc209ac08dd92c9d50a77e3330e7aedd9 Mon Sep 17 00:00:00 2001
2From: Patrick Zacharias <1475802+Fighter19@users.noreply.github.com>
3Date: Thu, 7 Nov 2024 14:03:29 +0100
4Subject: [PATCH] Determine audio buffer size for a time of 500ms
5
6On some hardware like the SGTL5000, not specifying a buffer size
7results to EINVAL being returned.
8
9This code sets the buffer time to 500ms and the period time to a fourth of that,
10or whatever is nearest to that.
11
12Upstream-Status: Pending
13---
14 src/alsa.c | 15 +++++++++++++++
15 1 file changed, 15 insertions(+)
16
17diff --git a/src/alsa.c b/src/alsa.c
18index bebcc4a..ac26578 100644
19--- a/src/alsa.c
20+++ b/src/alsa.c
21@@ -258,6 +258,21 @@ static int open_alsa(ca_context *c, struct outstanding *out) {
22 if ((ret = snd_pcm_hw_params_set_channels(out->pcm, hwparams, ca_sound_file_get_nchannels(out->file))) < 0)
23 goto finish;
24
25+ unsigned int buffer_time = 0;
26+ if ((ret = snd_pcm_hw_params_get_buffer_time_max(hwparams, &buffer_time, 0)) < 0)
27+ goto finish;
28+
29+ // Cap the buffer time to 500ms
30+ if (buffer_time > 500000)
31+ buffer_time = 500000;
32+
33+ unsigned int period_time = buffer_time / 4;
34+ if ((ret = snd_pcm_hw_params_set_period_time_near(out->pcm, hwparams, &period_time, 0)) < 0)
35+ goto finish;
36+
37+ if ((ret = snd_pcm_hw_params_set_buffer_time_near(out->pcm, hwparams, &buffer_time, 0)) < 0)
38+ goto finish;
39+
40 if ((ret = snd_pcm_hw_params(out->pcm, hwparams)) < 0)
41 goto finish;
42
diff --git a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
index 95c9479588..7eac53ae90 100644
--- a/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
+++ b/meta-oe/recipes-support/libcanberra/libcanberra_0.30.bb
@@ -13,8 +13,8 @@ SRC_URI = " \
13 file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \ 13 file://0001-build-gtk-and-gtk3-version-for-canberra_gtk_play.patch \
14 file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \ 14 file://0001-gtk-Don-t-assume-all-GdkDisplays-are-GdkX11Displays-.patch \
15 file://0001-remove-dropped-templates.patch \ 15 file://0001-remove-dropped-templates.patch \
16 file://0001-Determine-audio-buffer-size-for-a-time-of-500ms.patch \
16" 17"
17SRC_URI[md5sum] = "34cb7e4430afaf6f447c4ebdb9b42072"
18SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72" 18SRC_URI[sha256sum] = "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
19 19
20EXTRA_OECONF = "\ 20EXTRA_OECONF = "\
diff --git a/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch
new file mode 100644
index 0000000000..86ee6902f2
--- /dev/null
+++ b/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch
@@ -0,0 +1,41 @@
1From 395cd70a8c28a4ea408a227d745fe20ed8af9105 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 10 Sep 2024 18:11:40 -0700
4Subject: [PATCH] Fix instances of
5 -Wmissing-template-arg-list-after-template-kw.
6
7Clang has a new warning that requires a template argument list after using
8the template keyword. Remove uses of the template keyword when we're not
9specifying types.
10
11See https://github.com/llvm/llvm-project/issues/94194 for the upstream
12clang changes
13
14Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/835]
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 include/cereal/types/tuple.hpp | 4 ++--
18 1 file changed, 2 insertions(+), 2 deletions(-)
19
20diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp
21index 80c68075..5c79eca9 100644
22--- a/include/cereal/types/tuple.hpp
23+++ b/include/cereal/types/tuple.hpp
24@@ -95,7 +95,7 @@ namespace cereal
25 template <class Archive, class ... Types> inline
26 static void apply( Archive & ar, std::tuple<Types...> & tuple )
27 {
28- serialize<Height - 1>::template apply( ar, tuple );
29+ serialize<Height - 1>::apply( ar, tuple );
30 ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(),
31 std::get<Height - 1>( tuple )) );
32 }
33@@ -116,7 +116,7 @@ namespace cereal
34 template <class Archive, class ... Types> inline
35 void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple )
36 {
37- tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple );
38+ tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple );
39 }
40 } // namespace cereal
41
diff --git a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
index 6ad20d6370..7d4a352a31 100644
--- a/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
+++ b/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb
@@ -22,10 +22,10 @@ SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \
22 file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ 22 file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \
23 file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ 23 file://0001-cmake-Use-idirafter-instead-of-isystem.patch \
24 file://0001-doctest-Do-not-use-unnamed-class.patch \ 24 file://0001-doctest-Do-not-use-unnamed-class.patch \
25 file://0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch \
25 file://run-ptest \ 26 file://run-ptest \
26" 27"
27 28
28S = "${WORKDIR}/git"
29 29
30inherit cmake pkgconfig ptest 30inherit cmake pkgconfig ptest
31 31
diff --git a/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch
new file mode 100644
index 0000000000..aa9fab86e6
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch
@@ -0,0 +1,48 @@
1From b684f4cc25821b6e86a58576f864e4b12dfdfecc Mon Sep 17 00:00:00 2001
2From: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
3Date: Sat, 5 Jun 2021 22:57:51 +0200
4Subject: [PATCH] only apply search path logic to relative pathnames
5
6Adding any directory to the search path via cfg_add_searchpath breaks
7lookup of absolute paths. So change the logic in cfg_searchpath() to
8ignore the search path when the given filename is absolute, and merely
9check that for existence.
10
11This is technically an ABI change, but the current behaviour is quite
12unusual and unexpected.
13
14Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/pull/155]
15
16Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk>
17---
18 src/confuse.c | 8 ++++++++
19 1 file changed, 8 insertions(+)
20
21diff --git a/src/confuse.c b/src/confuse.c
22index 2ea0254..19b56e3 100644
23--- a/src/confuse.c
24+++ b/src/confuse.c
25@@ -1746,12 +1746,20 @@ DLLIMPORT char *cfg_searchpath(cfg_searchpath_t *p, const char *file)
26 return NULL;
27 }
28
29+ if (file[0] == '/') {
30+ fullpath = strdup(file);
31+ if (!fullpath)
32+ return NULL;
33+ goto check;
34+ }
35+
36 if ((fullpath = cfg_searchpath(p->next, file)) != NULL)
37 return fullpath;
38
39 if ((fullpath = cfg_make_fullpath(p->dir, file)) == NULL)
40 return NULL;
41
42+check:
43 #ifdef HAVE_SYS_STAT_H
44 err = stat((const char *)fullpath, &st);
45 if ((!err) && S_ISREG(st.st_mode))
46--
472.31.1
48
diff --git a/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch b/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch
new file mode 100755
index 0000000000..52296b9c0f
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/files/CVE-2022-40320.patch
@@ -0,0 +1,42 @@
1From d73777c2c3566fb2647727bb56d9a2295b81669b Mon Sep 17 00:00:00 2001
2From: Joachim Wiberg <troglobit@gmail.com>
3Date: Fri, 2 Sep 2022 16:12:46 +0200
4Subject: [PATCH] Fix #163: unterminated username used with getpwnam()
5
6Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
7
8CVE: CVE-2022-40320
9Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/commit/d73777c2c3566fb2647727bb56d9a2295b81669b]
10Signed-off-by: Peter Marko <peter.marko@siemens.com>
11---
12 src/confuse.c | 9 ++++++---
13 1 file changed, 6 insertions(+), 3 deletions(-)
14
15diff --git a/src/confuse.c b/src/confuse.c
16index 6d1fdbd..05566b5 100644
17--- a/src/confuse.c
18+++ b/src/confuse.c
19@@ -1872,17 +1872,20 @@ DLLIMPORT char *cfg_tilde_expand(const char *filename)
20 file = filename + 1;
21 } else {
22 /* ~user or ~user/path */
23- char *user;
24+ char *user; /* ~user or ~user/path */
25+ size_t len;
26
27 file = strchr(filename, '/');
28 if (file == 0)
29 file = filename + strlen(filename);
30
31- user = malloc(file - filename);
32+ len = file - filename - 1;
33+ user = malloc(len + 1);
34 if (!user)
35 return NULL;
36
37- strncpy(user, filename + 1, file - filename - 1);
38+ strncpy(user, &filename[1], len);
39+ user[len] = 0;
40 passwd = getpwnam(user);
41 free(user);
42 }
diff --git a/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb
new file mode 100644
index 0000000000..20966a535c
--- /dev/null
+++ b/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb
@@ -0,0 +1,15 @@
1SUMMARY = "libConfuse is a configuration file parser library"
2LICENSE = "ISC"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a"
4
5SRC_URI = "https://github.com/libconfuse/libconfuse/releases/download/v${PV}/confuse-${PV}.tar.gz"
6SRC_URI[sha256sum] = "3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8"
7
8SRC_URI += "file://0001-only-apply-search-path-logic-to-relative-pathnames.patch"
9SRC_URI += "file://CVE-2022-40320.patch"
10
11inherit autotools-brokensep pkgconfig gettext
12
13S = "${UNPACKDIR}/confuse-${PV}"
14
15BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
index cf2d933169..d825f8fdee 100644
--- a/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
+++ b/meta-oe/recipes-support/libcppkafka/libcppkafka_git.bb
@@ -21,7 +21,6 @@ inherit cmake
21 21
22EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON" 22EXTRA_OECMAKE = "-DCPPKAFKA_BUILD_SHARED=ON"
23 23
24S = "${WORKDIR}/git"
25 24
26do_install:append(){ 25do_install:append(){
27 chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV} 26 chrpath -d ${D}${libdir}/libcppkafka.so.${BASEPV}
diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch
new file mode 100644
index 0000000000..74ff091c94
--- /dev/null
+++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial/0001-Fix-gcc-15-incompatible-pointer-types-error.patch
@@ -0,0 +1,41 @@
1From 7b5318037b2a21a592e8a85c9724c1dc35078426 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Thu, 3 Apr 2025 20:42:03 +0900
4Subject: [PATCH] Fix gcc 15 incompatible-pointer-types error
5
6* Fix incompatible pointer type error in signal function parameter
7TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:101:22: error: passing argument 2 of 'signal' from incompatible pointer type [-Wincompatible-pointer-types]
8 101 | signal (SIGUSR1, deviceHotPlug);
9 | ^~~~~~~~~~~~~
10 | |
11 | void (*)(void)
12In file included from TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:25:
13TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/recipe-sysroot/usr/include/signal.h:88:57: note: expected '__sighandler_t' {aka 'void (*)(int)'} but argument is of type 'void (*)(void)'
14 88 | extern __sighandler_t signal (int __sig, __sighandler_t __handler)
15 | ~~~~~~~~~~~~~~~^~~~~~~~~
16TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/git/tools/cyusbserialtest.c:83:6: note: 'deviceHotPlug' declared here
17 83 | void deviceHotPlug () {
18 | ^~~~~~~~~~~~~
19TOPDIR/tmp/work/core2-64-oe-linux/libcyusbserial/1.0.0+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
20 72 | typedef void (*__sighandler_t) (int);
21 | ^~~~~~~~~~~~~~
22
23Upstream-Status: Submitted [https://github.com/cyrozap/libcyusbserial/pull/7]
24Signed-off-by: mark.yang <mark.yang@lge.com>
25---
26 tools/cyusbserialtest.c | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/tools/cyusbserialtest.c b/tools/cyusbserialtest.c
30index 9f21249..92e91a1 100644
31--- a/tools/cyusbserialtest.c
32+++ b/tools/cyusbserialtest.c
33@@ -80,7 +80,7 @@ int getUserInput()
34 return output;
35 }
36
37-void deviceHotPlug () {
38+void deviceHotPlug (int sig) {
39 CY_RETURN_STATUS rStatus;
40 deviceAddedRemoved = true;
41 selectedDeviceNum = -1;
diff --git a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
index dd7f457b10..939e7db24e 100644
--- a/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
+++ b/meta-oe/recipes-support/libcyusbserial/libcyusbserial_git.bb
@@ -10,9 +10,9 @@ PV = "1.0.0+git"
10SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f" 10SRCREV = "655e2d544183d094f0e2d119c7e0c6206a0ddb3f"
11SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \ 11SRC_URI = "git://github.com/cyrozap/${BPN}.git;branch=master;protocol=https \
12 file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \ 12 file://0001-CMakeLists.txt-don-t-fall-back-CMAKE_INSTALL_LIBDIR-.patch \
13 file://0001-Fix-gcc-15-incompatible-pointer-types-error.patch \
13" 14"
14 15
15S = "${WORKDIR}/git"
16 16
17inherit cmake 17inherit cmake
18 18
diff --git a/meta-oe/recipes-support/libee/libee.inc b/meta-oe/recipes-support/libee/libee.inc
deleted file mode 100644
index 592109b951..0000000000
--- a/meta-oe/recipes-support/libee/libee.inc
+++ /dev/null
@@ -1,39 +0,0 @@
1SUMMARY = "An Event Expression Library inspired by CEE"
2DESCRIPTION = "The core idea of libee is to provide a small \
3but hopefully convenient API layer above the CEE standard."
4
5HOMEPAGE = "http://www.libee.org"
6SECTION = "base"
7
8LICENSE = "LGPL-2.1-or-later"
9LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6"
10
11SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\
12 file://libee-parallel-make.patch \
13 file://run-ptest \
14 file://ezapi1.sh \
15"
16
17inherit autotools ptest pkgconfig
18
19DEPENDS += "libestr"
20
21PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}"
22
23PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,,"
24PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,,"
25
26TESTDIR = "tests"
27
28# We presume the tests we are going to install so just build them directly.
29#
30do_compile_ptest() {
31 oe_runmake -C ${TESTDIR} genfile ezapi1
32}
33
34do_install_ptest() {
35 install -d ${D}${PTEST_PATH}
36 install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH}
37 install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH}
38 install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH}
39}
diff --git a/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-oe/recipes-support/libee/libee/ezapi1.sh
deleted file mode 100755
index e9db5e614b..0000000000
--- a/meta-oe/recipes-support/libee/libee/ezapi1.sh
+++ /dev/null
@@ -1,14 +0,0 @@
1#!/bin/sh
2#
3echo ---------------------------------------------------------------------------
4echo A very basic test for the event class
5echo ---------------------------------------------------------------------------
6rm -f infile
7./genfile 100 > infile
8./ezapi1 -iinfile
9if [ $? -ne 0 ] ; then
10 echo "FAIL: $0"
11 exit 1
12fi
13echo "PASS: $0"
14rm -f infile
diff --git a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
deleted file mode 100644
index 8bb23aafca..0000000000
--- a/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch
+++ /dev/null
@@ -1,20 +0,0 @@
1fix parallel compiling problem
2
3without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert
4can't find libee.la when linking as libee is not generated yet.
5
6Upstream-Status: Pending
7
8Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
9---
10diff --git a/src/Makefile.am b/src/Makefile.am
11index 08aaa9e..f0c78f7 100644
12--- a/src/Makefile.am
13+++ b/src/Makefile.am
14@@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0
15 libee_convert_SOURCES = convert.c
16 libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS)
17 libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS)
18+libee_convert_DEPENDENCIES = libee.la
19
20 include_HEADERS =
diff --git a/meta-oe/recipes-support/libee/libee/run-ptest b/meta-oe/recipes-support/libee/libee/run-ptest
deleted file mode 100755
index 3cb6607645..0000000000
--- a/meta-oe/recipes-support/libee/libee/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
1#!/bin/sh
2#
3./ezapi1.sh
diff --git a/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-oe/recipes-support/libee/libee_0.4.1.bb
deleted file mode 100644
index ef2c20db5a..0000000000
--- a/meta-oe/recipes-support/libee/libee_0.4.1.bb
+++ /dev/null
@@ -1,4 +0,0 @@
1require ${BPN}.inc
2
3SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2"
4SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027"
diff --git a/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch b/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch
new file mode 100644
index 0000000000..2d19bc23c8
--- /dev/null
+++ b/meta-oe/recipes-support/libeigen/libeigen/0002-Remove-LGPL-Code-and-references.patch
@@ -0,0 +1,1040 @@
1From e63a6950dbebf4dd95e5c74c423c06fd65df5182 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Antonio=20S=C3=A1nchez?= <cantonios@google.com>
3Date: Wed, 8 Feb 2023 01:25:06 +0000
4Subject: [PATCH] Remove LGPL Code and references.
5
6Upstream-Status: Backport [https://gitlab.com/libeigen/eigen/-/commit/e256ad1823c2eddd6954241ddc99bfeb7bb29cb3]
7---
8 COPYING.LGPL | 502 ------------------
9 COPYING.README | 16 +-
10 Eigen/src/Core/util/NonMPL2.h | 3 -
11 .../IncompleteCholesky.h | 3 +-
12 bench/tensors/eigen_sycl_bench.sh | 1 -
13 bench/tensors/eigen_sycl_bench_contract.sh | 2 +-
14 doc/PreprocessorDirectives.dox | 3 -
15 test/CMakeLists.txt | 1 -
16 test/mpl2only.cpp | 24 -
17 unsupported/Eigen/IterativeSolvers | 6 -
18 .../IterativeSolvers/ConstrainedConjGrad.h | 187 -------
19 .../IterativeSolvers/IterationController.h | 154 ------
20 12 files changed, 4 insertions(+), 898 deletions(-)
21 delete mode 100644 COPYING.LGPL
22 delete mode 100644 Eigen/src/Core/util/NonMPL2.h
23 delete mode 100644 test/mpl2only.cpp
24 delete mode 100644 unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
25 delete mode 100644 unsupported/Eigen/src/IterativeSolvers/IterationController.h
26
27diff --git a/COPYING.LGPL b/COPYING.LGPL
28deleted file mode 100644
29index 4362b4915..000000000
30--- a/COPYING.LGPL
31+++ /dev/null
32@@ -1,502 +0,0 @@
33- GNU LESSER GENERAL PUBLIC LICENSE
34- Version 2.1, February 1999
35-
36- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
37- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
38- Everyone is permitted to copy and distribute verbatim copies
39- of this license document, but changing it is not allowed.
40-
41-[This is the first released version of the Lesser GPL. It also counts
42- as the successor of the GNU Library Public License, version 2, hence
43- the version number 2.1.]
44-
45- Preamble
46-
47- The licenses for most software are designed to take away your
48-freedom to share and change it. By contrast, the GNU General Public
49-Licenses are intended to guarantee your freedom to share and change
50-free software--to make sure the software is free for all its users.
51-
52- This license, the Lesser General Public License, applies to some
53-specially designated software packages--typically libraries--of the
54-Free Software Foundation and other authors who decide to use it. You
55-can use it too, but we suggest you first think carefully about whether
56-this license or the ordinary General Public License is the better
57-strategy to use in any particular case, based on the explanations below.
58-
59- When we speak of free software, we are referring to freedom of use,
60-not price. Our General Public Licenses are designed to make sure that
61-you have the freedom to distribute copies of free software (and charge
62-for this service if you wish); that you receive source code or can get
63-it if you want it; that you can change the software and use pieces of
64-it in new free programs; and that you are informed that you can do
65-these things.
66-
67- To protect your rights, we need to make restrictions that forbid
68-distributors to deny you these rights or to ask you to surrender these
69-rights. These restrictions translate to certain responsibilities for
70-you if you distribute copies of the library or if you modify it.
71-
72- For example, if you distribute copies of the library, whether gratis
73-or for a fee, you must give the recipients all the rights that we gave
74-you. You must make sure that they, too, receive or can get the source
75-code. If you link other code with the library, you must provide
76-complete object files to the recipients, so that they can relink them
77-with the library after making changes to the library and recompiling
78-it. And you must show them these terms so they know their rights.
79-
80- We protect your rights with a two-step method: (1) we copyright the
81-library, and (2) we offer you this license, which gives you legal
82-permission to copy, distribute and/or modify the library.
83-
84- To protect each distributor, we want to make it very clear that
85-there is no warranty for the free library. Also, if the library is
86-modified by someone else and passed on, the recipients should know
87-that what they have is not the original version, so that the original
88-author's reputation will not be affected by problems that might be
89-introduced by others.
90-
91- Finally, software patents pose a constant threat to the existence of
92-any free program. We wish to make sure that a company cannot
93-effectively restrict the users of a free program by obtaining a
94-restrictive license from a patent holder. Therefore, we insist that
95-any patent license obtained for a version of the library must be
96-consistent with the full freedom of use specified in this license.
97-
98- Most GNU software, including some libraries, is covered by the
99-ordinary GNU General Public License. This license, the GNU Lesser
100-General Public License, applies to certain designated libraries, and
101-is quite different from the ordinary General Public License. We use
102-this license for certain libraries in order to permit linking those
103-libraries into non-free programs.
104-
105- When a program is linked with a library, whether statically or using
106-a shared library, the combination of the two is legally speaking a
107-combined work, a derivative of the original library. The ordinary
108-General Public License therefore permits such linking only if the
109-entire combination fits its criteria of freedom. The Lesser General
110-Public License permits more lax criteria for linking other code with
111-the library.
112-
113- We call this license the "Lesser" General Public License because it
114-does Less to protect the user's freedom than the ordinary General
115-Public License. It also provides other free software developers Less
116-of an advantage over competing non-free programs. These disadvantages
117-are the reason we use the ordinary General Public License for many
118-libraries. However, the Lesser license provides advantages in certain
119-special circumstances.
120-
121- For example, on rare occasions, there may be a special need to
122-encourage the widest possible use of a certain library, so that it becomes
123-a de-facto standard. To achieve this, non-free programs must be
124-allowed to use the library. A more frequent case is that a free
125-library does the same job as widely used non-free libraries. In this
126-case, there is little to gain by limiting the free library to free
127-software only, so we use the Lesser General Public License.
128-
129- In other cases, permission to use a particular library in non-free
130-programs enables a greater number of people to use a large body of
131-free software. For example, permission to use the GNU C Library in
132-non-free programs enables many more people to use the whole GNU
133-operating system, as well as its variant, the GNU/Linux operating
134-system.
135-
136- Although the Lesser General Public License is Less protective of the
137-users' freedom, it does ensure that the user of a program that is
138-linked with the Library has the freedom and the wherewithal to run
139-that program using a modified version of the Library.
140-
141- The precise terms and conditions for copying, distribution and
142-modification follow. Pay close attention to the difference between a
143-"work based on the library" and a "work that uses the library". The
144-former contains code derived from the library, whereas the latter must
145-be combined with the library in order to run.
146-
147- GNU LESSER GENERAL PUBLIC LICENSE
148- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
149-
150- 0. This License Agreement applies to any software library or other
151-program which contains a notice placed by the copyright holder or
152-other authorized party saying it may be distributed under the terms of
153-this Lesser General Public License (also called "this License").
154-Each licensee is addressed as "you".
155-
156- A "library" means a collection of software functions and/or data
157-prepared so as to be conveniently linked with application programs
158-(which use some of those functions and data) to form executables.
159-
160- The "Library", below, refers to any such software library or work
161-which has been distributed under these terms. A "work based on the
162-Library" means either the Library or any derivative work under
163-copyright law: that is to say, a work containing the Library or a
164-portion of it, either verbatim or with modifications and/or translated
165-straightforwardly into another language. (Hereinafter, translation is
166-included without limitation in the term "modification".)
167-
168- "Source code" for a work means the preferred form of the work for
169-making modifications to it. For a library, complete source code means
170-all the source code for all modules it contains, plus any associated
171-interface definition files, plus the scripts used to control compilation
172-and installation of the library.
173-
174- Activities other than copying, distribution and modification are not
175-covered by this License; they are outside its scope. The act of
176-running a program using the Library is not restricted, and output from
177-such a program is covered only if its contents constitute a work based
178-on the Library (independent of the use of the Library in a tool for
179-writing it). Whether that is true depends on what the Library does
180-and what the program that uses the Library does.
181-
182- 1. You may copy and distribute verbatim copies of the Library's
183-complete source code as you receive it, in any medium, provided that
184-you conspicuously and appropriately publish on each copy an
185-appropriate copyright notice and disclaimer of warranty; keep intact
186-all the notices that refer to this License and to the absence of any
187-warranty; and distribute a copy of this License along with the
188-Library.
189-
190- You may charge a fee for the physical act of transferring a copy,
191-and you may at your option offer warranty protection in exchange for a
192-fee.
193-
194- 2. You may modify your copy or copies of the Library or any portion
195-of it, thus forming a work based on the Library, and copy and
196-distribute such modifications or work under the terms of Section 1
197-above, provided that you also meet all of these conditions:
198-
199- a) The modified work must itself be a software library.
200-
201- b) You must cause the files modified to carry prominent notices
202- stating that you changed the files and the date of any change.
203-
204- c) You must cause the whole of the work to be licensed at no
205- charge to all third parties under the terms of this License.
206-
207- d) If a facility in the modified Library refers to a function or a
208- table of data to be supplied by an application program that uses
209- the facility, other than as an argument passed when the facility
210- is invoked, then you must make a good faith effort to ensure that,
211- in the event an application does not supply such function or
212- table, the facility still operates, and performs whatever part of
213- its purpose remains meaningful.
214-
215- (For example, a function in a library to compute square roots has
216- a purpose that is entirely well-defined independent of the
217- application. Therefore, Subsection 2d requires that any
218- application-supplied function or table used by this function must
219- be optional: if the application does not supply it, the square
220- root function must still compute square roots.)
221-
222-These requirements apply to the modified work as a whole. If
223-identifiable sections of that work are not derived from the Library,
224-and can be reasonably considered independent and separate works in
225-themselves, then this License, and its terms, do not apply to those
226-sections when you distribute them as separate works. But when you
227-distribute the same sections as part of a whole which is a work based
228-on the Library, the distribution of the whole must be on the terms of
229-this License, whose permissions for other licensees extend to the
230-entire whole, and thus to each and every part regardless of who wrote
231-it.
232-
233-Thus, it is not the intent of this section to claim rights or contest
234-your rights to work written entirely by you; rather, the intent is to
235-exercise the right to control the distribution of derivative or
236-collective works based on the Library.
237-
238-In addition, mere aggregation of another work not based on the Library
239-with the Library (or with a work based on the Library) on a volume of
240-a storage or distribution medium does not bring the other work under
241-the scope of this License.
242-
243- 3. You may opt to apply the terms of the ordinary GNU General Public
244-License instead of this License to a given copy of the Library. To do
245-this, you must alter all the notices that refer to this License, so
246-that they refer to the ordinary GNU General Public License, version 2,
247-instead of to this License. (If a newer version than version 2 of the
248-ordinary GNU General Public License has appeared, then you can specify
249-that version instead if you wish.) Do not make any other change in
250-these notices.
251-
252- Once this change is made in a given copy, it is irreversible for
253-that copy, so the ordinary GNU General Public License applies to all
254-subsequent copies and derivative works made from that copy.
255-
256- This option is useful when you wish to copy part of the code of
257-the Library into a program that is not a library.
258-
259- 4. You may copy and distribute the Library (or a portion or
260-derivative of it, under Section 2) in object code or executable form
261-under the terms of Sections 1 and 2 above provided that you accompany
262-it with the complete corresponding machine-readable source code, which
263-must be distributed under the terms of Sections 1 and 2 above on a
264-medium customarily used for software interchange.
265-
266- If distribution of object code is made by offering access to copy
267-from a designated place, then offering equivalent access to copy the
268-source code from the same place satisfies the requirement to
269-distribute the source code, even though third parties are not
270-compelled to copy the source along with the object code.
271-
272- 5. A program that contains no derivative of any portion of the
273-Library, but is designed to work with the Library by being compiled or
274-linked with it, is called a "work that uses the Library". Such a
275-work, in isolation, is not a derivative work of the Library, and
276-therefore falls outside the scope of this License.
277-
278- However, linking a "work that uses the Library" with the Library
279-creates an executable that is a derivative of the Library (because it
280-contains portions of the Library), rather than a "work that uses the
281-library". The executable is therefore covered by this License.
282-Section 6 states terms for distribution of such executables.
283-
284- When a "work that uses the Library" uses material from a header file
285-that is part of the Library, the object code for the work may be a
286-derivative work of the Library even though the source code is not.
287-Whether this is true is especially significant if the work can be
288-linked without the Library, or if the work is itself a library. The
289-threshold for this to be true is not precisely defined by law.
290-
291- If such an object file uses only numerical parameters, data
292-structure layouts and accessors, and small macros and small inline
293-functions (ten lines or less in length), then the use of the object
294-file is unrestricted, regardless of whether it is legally a derivative
295-work. (Executables containing this object code plus portions of the
296-Library will still fall under Section 6.)
297-
298- Otherwise, if the work is a derivative of the Library, you may
299-distribute the object code for the work under the terms of Section 6.
300-Any executables containing that work also fall under Section 6,
301-whether or not they are linked directly with the Library itself.
302-
303- 6. As an exception to the Sections above, you may also combine or
304-link a "work that uses the Library" with the Library to produce a
305-work containing portions of the Library, and distribute that work
306-under terms of your choice, provided that the terms permit
307-modification of the work for the customer's own use and reverse
308-engineering for debugging such modifications.
309-
310- You must give prominent notice with each copy of the work that the
311-Library is used in it and that the Library and its use are covered by
312-this License. You must supply a copy of this License. If the work
313-during execution displays copyright notices, you must include the
314-copyright notice for the Library among them, as well as a reference
315-directing the user to the copy of this License. Also, you must do one
316-of these things:
317-
318- a) Accompany the work with the complete corresponding
319- machine-readable source code for the Library including whatever
320- changes were used in the work (which must be distributed under
321- Sections 1 and 2 above); and, if the work is an executable linked
322- with the Library, with the complete machine-readable "work that
323- uses the Library", as object code and/or source code, so that the
324- user can modify the Library and then relink to produce a modified
325- executable containing the modified Library. (It is understood
326- that the user who changes the contents of definitions files in the
327- Library will not necessarily be able to recompile the application
328- to use the modified definitions.)
329-
330- b) Use a suitable shared library mechanism for linking with the
331- Library. A suitable mechanism is one that (1) uses at run time a
332- copy of the library already present on the user's computer system,
333- rather than copying library functions into the executable, and (2)
334- will operate properly with a modified version of the library, if
335- the user installs one, as long as the modified version is
336- interface-compatible with the version that the work was made with.
337-
338- c) Accompany the work with a written offer, valid for at
339- least three years, to give the same user the materials
340- specified in Subsection 6a, above, for a charge no more
341- than the cost of performing this distribution.
342-
343- d) If distribution of the work is made by offering access to copy
344- from a designated place, offer equivalent access to copy the above
345- specified materials from the same place.
346-
347- e) Verify that the user has already received a copy of these
348- materials or that you have already sent this user a copy.
349-
350- For an executable, the required form of the "work that uses the
351-Library" must include any data and utility programs needed for
352-reproducing the executable from it. However, as a special exception,
353-the materials to be distributed need not include anything that is
354-normally distributed (in either source or binary form) with the major
355-components (compiler, kernel, and so on) of the operating system on
356-which the executable runs, unless that component itself accompanies
357-the executable.
358-
359- It may happen that this requirement contradicts the license
360-restrictions of other proprietary libraries that do not normally
361-accompany the operating system. Such a contradiction means you cannot
362-use both them and the Library together in an executable that you
363-distribute.
364-
365- 7. You may place library facilities that are a work based on the
366-Library side-by-side in a single library together with other library
367-facilities not covered by this License, and distribute such a combined
368-library, provided that the separate distribution of the work based on
369-the Library and of the other library facilities is otherwise
370-permitted, and provided that you do these two things:
371-
372- a) Accompany the combined library with a copy of the same work
373- based on the Library, uncombined with any other library
374- facilities. This must be distributed under the terms of the
375- Sections above.
376-
377- b) Give prominent notice with the combined library of the fact
378- that part of it is a work based on the Library, and explaining
379- where to find the accompanying uncombined form of the same work.
380-
381- 8. You may not copy, modify, sublicense, link with, or distribute
382-the Library except as expressly provided under this License. Any
383-attempt otherwise to copy, modify, sublicense, link with, or
384-distribute the Library is void, and will automatically terminate your
385-rights under this License. However, parties who have received copies,
386-or rights, from you under this License will not have their licenses
387-terminated so long as such parties remain in full compliance.
388-
389- 9. You are not required to accept this License, since you have not
390-signed it. However, nothing else grants you permission to modify or
391-distribute the Library or its derivative works. These actions are
392-prohibited by law if you do not accept this License. Therefore, by
393-modifying or distributing the Library (or any work based on the
394-Library), you indicate your acceptance of this License to do so, and
395-all its terms and conditions for copying, distributing or modifying
396-the Library or works based on it.
397-
398- 10. Each time you redistribute the Library (or any work based on the
399-Library), the recipient automatically receives a license from the
400-original licensor to copy, distribute, link with or modify the Library
401-subject to these terms and conditions. You may not impose any further
402-restrictions on the recipients' exercise of the rights granted herein.
403-You are not responsible for enforcing compliance by third parties with
404-this License.
405-
406- 11. If, as a consequence of a court judgment or allegation of patent
407-infringement or for any other reason (not limited to patent issues),
408-conditions are imposed on you (whether by court order, agreement or
409-otherwise) that contradict the conditions of this License, they do not
410-excuse you from the conditions of this License. If you cannot
411-distribute so as to satisfy simultaneously your obligations under this
412-License and any other pertinent obligations, then as a consequence you
413-may not distribute the Library at all. For example, if a patent
414-license would not permit royalty-free redistribution of the Library by
415-all those who receive copies directly or indirectly through you, then
416-the only way you could satisfy both it and this License would be to
417-refrain entirely from distribution of the Library.
418-
419-If any portion of this section is held invalid or unenforceable under any
420-particular circumstance, the balance of the section is intended to apply,
421-and the section as a whole is intended to apply in other circumstances.
422-
423-It is not the purpose of this section to induce you to infringe any
424-patents or other property right claims or to contest validity of any
425-such claims; this section has the sole purpose of protecting the
426-integrity of the free software distribution system which is
427-implemented by public license practices. Many people have made
428-generous contributions to the wide range of software distributed
429-through that system in reliance on consistent application of that
430-system; it is up to the author/donor to decide if he or she is willing
431-to distribute software through any other system and a licensee cannot
432-impose that choice.
433-
434-This section is intended to make thoroughly clear what is believed to
435-be a consequence of the rest of this License.
436-
437- 12. If the distribution and/or use of the Library is restricted in
438-certain countries either by patents or by copyrighted interfaces, the
439-original copyright holder who places the Library under this License may add
440-an explicit geographical distribution limitation excluding those countries,
441-so that distribution is permitted only in or among countries not thus
442-excluded. In such case, this License incorporates the limitation as if
443-written in the body of this License.
444-
445- 13. The Free Software Foundation may publish revised and/or new
446-versions of the Lesser General Public License from time to time.
447-Such new versions will be similar in spirit to the present version,
448-but may differ in detail to address new problems or concerns.
449-
450-Each version is given a distinguishing version number. If the Library
451-specifies a version number of this License which applies to it and
452-"any later version", you have the option of following the terms and
453-conditions either of that version or of any later version published by
454-the Free Software Foundation. If the Library does not specify a
455-license version number, you may choose any version ever published by
456-the Free Software Foundation.
457-
458- 14. If you wish to incorporate parts of the Library into other free
459-programs whose distribution conditions are incompatible with these,
460-write to the author to ask for permission. For software which is
461-copyrighted by the Free Software Foundation, write to the Free
462-Software Foundation; we sometimes make exceptions for this. Our
463-decision will be guided by the two goals of preserving the free status
464-of all derivatives of our free software and of promoting the sharing
465-and reuse of software generally.
466-
467- NO WARRANTY
468-
469- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
470-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
471-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
472-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
473-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
474-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
475-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
476-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
477-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
478-
479- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
480-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
481-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
482-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
483-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
484-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
485-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
486-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
487-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
488-DAMAGES.
489-
490- END OF TERMS AND CONDITIONS
491-
492- How to Apply These Terms to Your New Libraries
493-
494- If you develop a new library, and you want it to be of the greatest
495-possible use to the public, we recommend making it free software that
496-everyone can redistribute and change. You can do so by permitting
497-redistribution under these terms (or, alternatively, under the terms of the
498-ordinary General Public License).
499-
500- To apply these terms, attach the following notices to the library. It is
501-safest to attach them to the start of each source file to most effectively
502-convey the exclusion of warranty; and each file should have at least the
503-"copyright" line and a pointer to where the full notice is found.
504-
505- <one line to give the library's name and a brief idea of what it does.>
506- Copyright (C) <year> <name of author>
507-
508- This library is free software; you can redistribute it and/or
509- modify it under the terms of the GNU Lesser General Public
510- License as published by the Free Software Foundation; either
511- version 2.1 of the License, or (at your option) any later version.
512-
513- This library is distributed in the hope that it will be useful,
514- but WITHOUT ANY WARRANTY; without even the implied warranty of
515- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
516- Lesser General Public License for more details.
517-
518- You should have received a copy of the GNU Lesser General Public
519- License along with this library; if not, write to the Free Software
520- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
521-
522-Also add information on how to contact you by electronic and paper mail.
523-
524-You should also get your employer (if you work as a programmer) or your
525-school, if any, to sign a "copyright disclaimer" for the library, if
526-necessary. Here is a sample; alter the names:
527-
528- Yoyodyne, Inc., hereby disclaims all copyright interest in the
529- library `Frob' (a library for tweaking knobs) written by James Random Hacker.
530-
531- <signature of Ty Coon>, 1 April 1990
532- Ty Coon, President of Vice
533-
534-That's all there is to it!
535diff --git a/COPYING.README b/COPYING.README
536index de5b63215..11af93ca7 100644
537--- a/COPYING.README
538+++ b/COPYING.README
539@@ -2,17 +2,5 @@ Eigen is primarily MPL2 licensed. See COPYING.MPL2 and these links:
540 http://www.mozilla.org/MPL/2.0/
541 http://www.mozilla.org/MPL/2.0/FAQ.html
542
543-Some files contain third-party code under BSD or LGPL licenses, whence the other
544-COPYING.* files here.
545-
546-All the LGPL code is either LGPL 2.1-only, or LGPL 2.1-or-later.
547-For this reason, the COPYING.LGPL file contains the LGPL 2.1 text.
548-
549-If you want to guarantee that the Eigen code that you are #including is licensed
550-under the MPL2 and possibly more permissive licenses (like BSD), #define this
551-preprocessor symbol:
552- EIGEN_MPL2_ONLY
553-For example, with most compilers, you could add this to your project CXXFLAGS:
554- -DEIGEN_MPL2_ONLY
555-This will cause a compilation error to be generated if you #include any code that is
556-LGPL licensed.
557+Some files contain third-party code under BSD or other MPL2-compatible licenses,
558+whence the other COPYING.* files here.
559\ No newline at end of file
560diff --git a/Eigen/src/Core/util/NonMPL2.h b/Eigen/src/Core/util/NonMPL2.h
561deleted file mode 100644
562index 1af67cf18..000000000
563--- a/Eigen/src/Core/util/NonMPL2.h
564+++ /dev/null
565@@ -1,3 +0,0 @@
566-#ifdef EIGEN_MPL2_ONLY
567-#error Including non-MPL2 code in EIGEN_MPL2_ONLY mode
568-#endif
569diff --git a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
570index 7803fd817..1a5d7faeb 100644
571--- a/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
572+++ b/Eigen/src/IterativeLinearSolvers/IncompleteCholesky.h
573@@ -24,8 +24,7 @@ namespace Eigen {
574 * \tparam Scalar the scalar type of the input matrices
575 * \tparam _UpLo The triangular part that will be used for the computations. It can be Lower
576 * or Upper. Default is Lower.
577- * \tparam _OrderingType The ordering method to use, either AMDOrdering<> or NaturalOrdering<>. Default is AMDOrdering<int>,
578- * unless EIGEN_MPL2_ONLY is defined, in which case the default is NaturalOrdering<int>.
579+ * \tparam _OrderingType The ordering method to use, either AMDOrdering<> or NaturalOrdering<>. Default is AMDOrdering<int>.
580 *
581 * \implsparsesolverconcept
582 *
583diff --git a/bench/tensors/eigen_sycl_bench.sh b/bench/tensors/eigen_sycl_bench.sh
584index 3f67b3d86..4cb8f7be4 100755
585--- a/bench/tensors/eigen_sycl_bench.sh
586+++ b/bench/tensors/eigen_sycl_bench.sh
587@@ -10,7 +10,6 @@ benchmark_main.cc \
588 -march=native \
589 -O3 \
590 -DNDEBUG \
591--DEIGEN_MPL2_ONLY \
592 -DEIGEN_USE_SYCL=1 \
593 -DEIGEN_SYCL_LOCAL_MEM=1 \
594 -no-serial-memop \
595diff --git a/bench/tensors/eigen_sycl_bench_contract.sh b/bench/tensors/eigen_sycl_bench_contract.sh
596index 73fd6c4a0..3ab0138a1 100644
597--- a/bench/tensors/eigen_sycl_bench_contract.sh
598+++ b/bench/tensors/eigen_sycl_bench_contract.sh
599@@ -1,7 +1,7 @@
600 rm -f tensor_contract_sycl_bench
601 : "${COMPUTECPP_PACKAGE_ROOT_DIR:?Need to set COMPUTECPP_PACKAGE_ROOT_DIR}"
602 echo "COMPUTECPP_PACKAGE_ROOT_DIR is set to: "$COMPUTECPP_PACKAGE_ROOT_DIR
603-${COMPUTECPP_PACKAGE_ROOT_DIR}/bin/compute++ tensor_contract_sycl_bench.cc -I ../../ -I ${COMPUTECPP_PACKAGE_ROOT_DIR}/include/ -std=c++11 -O3 -DNDEBUG -DEIGEN_MPL2_ONLY -DEIGEN_USE_SYCL=1 -no-serial-memop -mllvm -inline-threshold=10000 -fsycl-ih-last -sycl-driver -Xclang -cl-mad-enable -lOpenCL -lComputeCpp -lpthread -o tensor_contract_sycl_bench ${@:1}
604+${COMPUTECPP_PACKAGE_ROOT_DIR}/bin/compute++ tensor_contract_sycl_bench.cc -I ../../ -I ${COMPUTECPP_PACKAGE_ROOT_DIR}/include/ -std=c++11 -O3 -DNDEBUG -DEIGEN_USE_SYCL=1 -no-serial-memop -mllvm -inline-threshold=10000 -fsycl-ih-last -sycl-driver -Xclang -cl-mad-enable -lOpenCL -lComputeCpp -lpthread -o tensor_contract_sycl_bench ${@:1}
605 export LD_LIBRARY_PATH=${COMPUTECPP_PACKAGE_ROOT_DIR}/lib:$LD_LIBRARY_PATH
606 ./tensor_contract_sycl_bench
607
608diff --git a/doc/PreprocessorDirectives.dox b/doc/PreprocessorDirectives.dox
609index 0f545b086..b7d59ccbc 100644
610--- a/doc/PreprocessorDirectives.dox
611+++ b/doc/PreprocessorDirectives.dox
612@@ -92,9 +92,6 @@ run time. However, these assertions do cost time and can thus be turned off.
613 - \b eigen_assert - macro with one argument that is used inside %Eigen for assertions. By default, it is
614 basically defined to be \c assert, which aborts the program if the assertion is violated. Redefine this
615 macro if you want to do something else, like throwing an exception.
616- - \b EIGEN_MPL2_ONLY - disable non MPL2 compatible features, or in other words disable the features which
617- are still under the LGPL.
618-
619
620 \section TopicPreprocessorDirectivesPerformance Alignment, vectorization and performance tweaking
621
622diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
623index 5136f82aa..9f557743a 100644
624--- a/test/CMakeLists.txt
625+++ b/test/CMakeLists.txt
626@@ -277,7 +277,6 @@ ei_add_test(special_numbers)
627 ei_add_test(rvalue_types)
628 ei_add_test(dense_storage)
629 ei_add_test(ctorleak)
630-ei_add_test(mpl2only)
631 ei_add_test(inplace_decomposition)
632 ei_add_test(half_float)
633 ei_add_test(bfloat16_float)
634diff --git a/test/mpl2only.cpp b/test/mpl2only.cpp
635deleted file mode 100644
636index 296350d08..000000000
637--- a/test/mpl2only.cpp
638+++ /dev/null
639@@ -1,24 +0,0 @@
640-// This file is part of Eigen, a lightweight C++ template library
641-// for linear algebra.
642-//
643-// Copyright (C) 2015 Gael Guennebaud <gael.guennebaud@inria.fr>
644-//
645-// This Source Code Form is subject to the terms of the Mozilla
646-// Public License v. 2.0. If a copy of the MPL was not distributed
647-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
648-
649-#ifndef EIGEN_MPL2_ONLY
650-#define EIGEN_MPL2_ONLY
651-#endif
652-#include <Eigen/Dense>
653-#include <Eigen/SparseCore>
654-#include <Eigen/SparseLU>
655-#include <Eigen/SparseQR>
656-#include <Eigen/Sparse>
657-#include <Eigen/IterativeLinearSolvers>
658-#include <Eigen/Eigen>
659-
660-int main()
661-{
662- return 0;
663-}
664diff --git a/unsupported/Eigen/IterativeSolvers b/unsupported/Eigen/IterativeSolvers
665index a3f58d676..f045fb607 100644
666--- a/unsupported/Eigen/IterativeSolvers
667+++ b/unsupported/Eigen/IterativeSolvers
668@@ -19,7 +19,6 @@
669 * \defgroup IterativeLinearSolvers_Module Iterative solvers module
670 * This module aims to provide various iterative linear and non linear solver algorithms.
671 * It currently provides:
672- * - a constrained conjugate gradient
673 * - a Householder GMRES implementation
674 * - an IDR(s) implementation
675 * - a DGMRES implementation
676@@ -33,11 +32,6 @@
677
678 #include "../../Eigen/src/Core/util/DisableStupidWarnings.h"
679
680-#ifndef EIGEN_MPL2_ONLY
681-#include "src/IterativeSolvers/IterationController.h"
682-#include "src/IterativeSolvers/ConstrainedConjGrad.h"
683-#endif
684-
685 #include "src/IterativeSolvers/IncompleteLU.h"
686 #include "src/IterativeSolvers/GMRES.h"
687 #include "src/IterativeSolvers/DGMRES.h"
688diff --git a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h b/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
689deleted file mode 100644
690index e7d70f39d..000000000
691--- a/unsupported/Eigen/src/IterativeSolvers/ConstrainedConjGrad.h
692+++ /dev/null
693@@ -1,187 +0,0 @@
694-// This file is part of Eigen, a lightweight C++ template library
695-// for linear algebra.
696-//
697-// Copyright (C) 2008 Gael Guennebaud <gael.guennebaud@inria.fr>
698-
699-/* NOTE The functions of this file have been adapted from the GMM++ library */
700-
701-//========================================================================
702-//
703-// Copyright (C) 2002-2007 Yves Renard
704-//
705-// This file is a part of GETFEM++
706-//
707-// Getfem++ is free software; you can redistribute it and/or modify
708-// it under the terms of the GNU Lesser General Public License as
709-// published by the Free Software Foundation; version 2.1 of the License.
710-//
711-// This program is distributed in the hope that it will be useful,
712-// but WITHOUT ANY WARRANTY; without even the implied warranty of
713-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
714-// GNU Lesser General Public License for more details.
715-// You should have received a copy of the GNU Lesser General Public
716-// License along with this program; if not, write to the Free Software
717-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
718-// USA.
719-//
720-//========================================================================
721-
722-#include "../../../../Eigen/src/Core/util/NonMPL2.h"
723-
724-#ifndef EIGEN_CONSTRAINEDCG_H
725-#define EIGEN_CONSTRAINEDCG_H
726-
727-#include "../../../../Eigen/Core"
728-
729-namespace Eigen {
730-
731-namespace internal {
732-
733-/** \ingroup IterativeLinearSolvers_Module
734- * Compute the pseudo inverse of the non-square matrix C such that
735- * \f$ CINV = (C * C^T)^{-1} * C \f$ based on a conjugate gradient method.
736- *
737- * This function is internally used by constrained_cg.
738- */
739-template <typename CMatrix, typename CINVMatrix>
740-void pseudo_inverse(const CMatrix &C, CINVMatrix &CINV)
741-{
742- // optimisable : copie de la ligne, precalcul de C * trans(C).
743- typedef typename CMatrix::Scalar Scalar;
744- typedef typename CMatrix::Index Index;
745- // FIXME use sparse vectors ?
746- typedef Matrix<Scalar,Dynamic,1> TmpVec;
747-
748- Index rows = C.rows(), cols = C.cols();
749-
750- TmpVec d(rows), e(rows), l(cols), p(rows), q(rows), r(rows);
751- Scalar rho, rho_1, alpha;
752- d.setZero();
753-
754- typedef Triplet<double> T;
755- std::vector<T> tripletList;
756-
757- for (Index i = 0; i < rows; ++i)
758- {
759- d[i] = 1.0;
760- rho = 1.0;
761- e.setZero();
762- r = d;
763- p = d;
764-
765- while (rho >= 1e-38)
766- { /* conjugate gradient to compute e */
767- /* which is the i-th row of inv(C * trans(C)) */
768- l = C.transpose() * p;
769- q = C * l;
770- alpha = rho / p.dot(q);
771- e += alpha * p;
772- r += -alpha * q;
773- rho_1 = rho;
774- rho = r.dot(r);
775- p = (rho/rho_1) * p + r;
776- }
777-
778- l = C.transpose() * e; // l is the i-th row of CINV
779- // FIXME add a generic "prune/filter" expression for both dense and sparse object to sparse
780- for (Index j=0; j<l.size(); ++j)
781- if (l[j]<1e-15)
782- tripletList.push_back(T(i,j,l(j)));
783-
784-
785- d[i] = 0.0;
786- }
787- CINV.setFromTriplets(tripletList.begin(), tripletList.end());
788-}
789-
790-
791-
792-/** \ingroup IterativeLinearSolvers_Module
793- * Constrained conjugate gradient
794- *
795- * Computes the minimum of \f$ 1/2((Ax).x) - bx \f$ under the constraint \f$ Cx \le f \f$
796- */
797-template<typename TMatrix, typename CMatrix,
798- typename VectorX, typename VectorB, typename VectorF>
799-void constrained_cg(const TMatrix& A, const CMatrix& C, VectorX& x,
800- const VectorB& b, const VectorF& f, IterationController &iter)
801-{
802- using std::sqrt;
803- typedef typename TMatrix::Scalar Scalar;
804- typedef typename TMatrix::Index Index;
805- typedef Matrix<Scalar,Dynamic,1> TmpVec;
806-
807- Scalar rho = 1.0, rho_1, lambda, gamma;
808- Index xSize = x.size();
809- TmpVec p(xSize), q(xSize), q2(xSize),
810- r(xSize), old_z(xSize), z(xSize),
811- memox(xSize);
812- std::vector<bool> satured(C.rows());
813- p.setZero();
814- iter.setRhsNorm(sqrt(b.dot(b))); // gael vect_sp(PS, b, b)
815- if (iter.rhsNorm() == 0.0) iter.setRhsNorm(1.0);
816-
817- SparseMatrix<Scalar,RowMajor> CINV(C.rows(), C.cols());
818- pseudo_inverse(C, CINV);
819-
820- while(true)
821- {
822- // computation of residual
823- old_z = z;
824- memox = x;
825- r = b;
826- r += A * -x;
827- z = r;
828- bool transition = false;
829- for (Index i = 0; i < C.rows(); ++i)
830- {
831- Scalar al = C.row(i).dot(x) - f.coeff(i);
832- if (al >= -1.0E-15)
833- {
834- if (!satured[i])
835- {
836- satured[i] = true;
837- transition = true;
838- }
839- Scalar bb = CINV.row(i).dot(z);
840- if (bb > 0.0)
841- // FIXME: we should allow that: z += -bb * C.row(i);
842- for (typename CMatrix::InnerIterator it(C,i); it; ++it)
843- z.coeffRef(it.index()) -= bb*it.value();
844- }
845- else
846- satured[i] = false;
847- }
848-
849- // descent direction
850- rho_1 = rho;
851- rho = r.dot(z);
852-
853- if (iter.finished(rho)) break;
854- if (transition || iter.first()) gamma = 0.0;
855- else gamma = (std::max)(0.0, (rho - old_z.dot(z)) / rho_1);
856- p = z + gamma*p;
857-
858- ++iter;
859- // one dimensionnal optimization
860- q = A * p;
861- lambda = rho / q.dot(p);
862- for (Index i = 0; i < C.rows(); ++i)
863- {
864- if (!satured[i])
865- {
866- Scalar bb = C.row(i).dot(p) - f[i];
867- if (bb > 0.0)
868- lambda = (std::min)(lambda, (f.coeff(i)-C.row(i).dot(x)) / bb);
869- }
870- }
871- x += lambda * p;
872- memox -= x;
873- }
874-}
875-
876-} // end namespace internal
877-
878-} // end namespace Eigen
879-
880-#endif // EIGEN_CONSTRAINEDCG_H
881diff --git a/unsupported/Eigen/src/IterativeSolvers/IterationController.h b/unsupported/Eigen/src/IterativeSolvers/IterationController.h
882deleted file mode 100644
883index a116e09e2..000000000
884--- a/unsupported/Eigen/src/IterativeSolvers/IterationController.h
885+++ /dev/null
886@@ -1,154 +0,0 @@
887-// This file is part of Eigen, a lightweight C++ template library
888-// for linear algebra.
889-//
890-// Copyright (C) 2008-2009 Gael Guennebaud <gael.guennebaud@inria.fr>
891-
892-/* NOTE The class IterationController has been adapted from the iteration
893- * class of the GMM++ and ITL libraries.
894- */
895-
896-//=======================================================================
897-// Copyright (C) 1997-2001
898-// Authors: Andrew Lumsdaine <lums@osl.iu.edu>
899-// Lie-Quan Lee <llee@osl.iu.edu>
900-//
901-// This file is part of the Iterative Template Library
902-//
903-// You should have received a copy of the License Agreement for the
904-// Iterative Template Library along with the software; see the
905-// file LICENSE.
906-//
907-// Permission to modify the code and to distribute modified code is
908-// granted, provided the text of this NOTICE is retained, a notice that
909-// the code was modified is included with the above COPYRIGHT NOTICE and
910-// with the COPYRIGHT NOTICE in the LICENSE file, and that the LICENSE
911-// file is distributed with the modified code.
912-//
913-// LICENSOR MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED.
914-// By way of example, but not limitation, Licensor MAKES NO
915-// REPRESENTATIONS OR WARRANTIES OF MERCHANTABILITY OR FITNESS FOR ANY
916-// PARTICULAR PURPOSE OR THAT THE USE OF THE LICENSED SOFTWARE COMPONENTS
917-// OR DOCUMENTATION WILL NOT INFRINGE ANY PATENTS, COPYRIGHTS, TRADEMARKS
918-// OR OTHER RIGHTS.
919-//=======================================================================
920-
921-//========================================================================
922-//
923-// Copyright (C) 2002-2007 Yves Renard
924-//
925-// This file is a part of GETFEM++
926-//
927-// Getfem++ is free software; you can redistribute it and/or modify
928-// it under the terms of the GNU Lesser General Public License as
929-// published by the Free Software Foundation; version 2.1 of the License.
930-//
931-// This program is distributed in the hope that it will be useful,
932-// but WITHOUT ANY WARRANTY; without even the implied warranty of
933-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
934-// GNU Lesser General Public License for more details.
935-// You should have received a copy of the GNU Lesser General Public
936-// License along with this program; if not, write to the Free Software
937-// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
938-// USA.
939-//
940-//========================================================================
941-
942-#include "../../../../Eigen/src/Core/util/NonMPL2.h"
943-
944-#ifndef EIGEN_ITERATION_CONTROLLER_H
945-#define EIGEN_ITERATION_CONTROLLER_H
946-
947-namespace Eigen {
948-
949-/** \ingroup IterativeLinearSolvers_Module
950- * \class IterationController
951- *
952- * \brief Controls the iterations of the iterative solvers
953- *
954- * This class has been adapted from the iteration class of GMM++ and ITL libraries.
955- *
956- */
957-class IterationController
958-{
959- protected :
960- double m_rhsn; ///< Right hand side norm
961- size_t m_maxiter; ///< Max. number of iterations
962- int m_noise; ///< if noise > 0 iterations are printed
963- double m_resmax; ///< maximum residual
964- double m_resminreach, m_resadd;
965- size_t m_nit; ///< iteration number
966- double m_res; ///< last computed residual
967- bool m_written;
968- void (*m_callback)(const IterationController&);
969- public :
970-
971- void init()
972- {
973- m_nit = 0; m_res = 0.0; m_written = false;
974- m_resminreach = 1E50; m_resadd = 0.0;
975- m_callback = 0;
976- }
977-
978- IterationController(double r = 1.0E-8, int noi = 0, size_t mit = size_t(-1))
979- : m_rhsn(1.0), m_maxiter(mit), m_noise(noi), m_resmax(r) { init(); }
980-
981- void operator ++(int) { m_nit++; m_written = false; m_resadd += m_res; }
982- void operator ++() { (*this)++; }
983-
984- bool first() { return m_nit == 0; }
985-
986- /* get/set the "noisyness" (verbosity) of the solvers */
987- int noiseLevel() const { return m_noise; }
988- void setNoiseLevel(int n) { m_noise = n; }
989- void reduceNoiseLevel() { if (m_noise > 0) m_noise--; }
990-
991- double maxResidual() const { return m_resmax; }
992- void setMaxResidual(double r) { m_resmax = r; }
993-
994- double residual() const { return m_res; }
995-
996- /* change the user-definable callback, called after each iteration */
997- void setCallback(void (*t)(const IterationController&))
998- {
999- m_callback = t;
1000- }
1001-
1002- size_t iteration() const { return m_nit; }
1003- void setIteration(size_t i) { m_nit = i; }
1004-
1005- size_t maxIterarions() const { return m_maxiter; }
1006- void setMaxIterations(size_t i) { m_maxiter = i; }
1007-
1008- double rhsNorm() const { return m_rhsn; }
1009- void setRhsNorm(double r) { m_rhsn = r; }
1010-
1011- bool converged() const { return m_res <= m_rhsn * m_resmax; }
1012- bool converged(double nr)
1013- {
1014- using std::abs;
1015- m_res = abs(nr);
1016- m_resminreach = (std::min)(m_resminreach, m_res);
1017- return converged();
1018- }
1019- template<typename VectorType> bool converged(const VectorType &v)
1020- { return converged(v.squaredNorm()); }
1021-
1022- bool finished(double nr)
1023- {
1024- if (m_callback) m_callback(*this);
1025- if (m_noise > 0 && !m_written)
1026- {
1027- converged(nr);
1028- m_written = true;
1029- }
1030- return (m_nit >= m_maxiter || converged(nr));
1031- }
1032- template <typename VectorType>
1033- bool finished(const MatrixBase<VectorType> &v)
1034- { return finished(double(v.squaredNorm())); }
1035-
1036-};
1037-
1038-} // end namespace Eigen
1039-
1040-#endif // EIGEN_ITERATION_CONTROLLER_H
diff --git a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
index 72044427dd..f5f874941a 100644
--- a/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
+++ b/meta-oe/recipes-support/libeigen/libeigen_3.4.0.bb
@@ -1,20 +1,24 @@
1DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." 1DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms."
2HOMEPAGE = "http://eigen.tuxfamily.org/" 2HOMEPAGE = "http://eigen.tuxfamily.org/"
3LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & LGPL-2.1-only & MINPACK" 3LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPL-2.0-only & Minpack"
4# The GPL code is only used for benchmark tests and does not affect what is installed.
5LICENSE:${PN} = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
6LICENSE:${PN}-dbg = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
7LICENSE:${PN}-dev = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & Minpack"
4LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ 8LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \
9 file://COPYING.APACHE;md5=8de23b8e93c63005353056b2475e9aa5 \
5 file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \ 10 file://COPYING.BSD;md5=2dd0510ee95e59ca28834b875bc96596 \
6 file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ 11 file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \
7 file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
8 file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \ 12 file://COPYING.MINPACK;md5=71d91b0f75ce79a75d3108a72bef8116 \
9" 13"
10 14
11SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \ 15SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;branch=3.4 \
12 file://0001-Default-eigen_packet_wrapper-constructor.patch \ 16 file://0001-Default-eigen_packet_wrapper-constructor.patch \
17 file://0002-Remove-LGPL-Code-and-references.patch \
13" 18"
14 19
15SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c" 20SRCREV = "3147391d946bb4b6c68edd901f2add6ac1f31f8c"
16 21
17S = "${WORKDIR}/git"
18 22
19inherit cmake 23inherit cmake
20 24
diff --git a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
index 2ebf2757d7..2490947f5d 100644
--- a/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
+++ b/meta-oe/recipes-support/libestr/libestr_0.1.11.bb
@@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9d6c993486c18262afba4ca5bcb894d0"
5 5
6SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz" 6SRC_URI = "http://libestr.adiscon.com/files/download/${BP}.tar.gz"
7 7
8SRC_URI[md5sum] = "1f25a2332750d4bfacfb314235fedff0"
9SRC_URI[sha256sum] = "46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024" 8SRC_URI[sha256sum] = "46632b2785ff4a231dcf241eeb0dcb5fc0c7d4da8ee49cf5687722cdbe8b2024"
10 9
11UPSTREAM_CHECK_URI = "http://libestr.adiscon.com/download/" 10UPSTREAM_CHECK_URI = "http://libestr.adiscon.com/download/"
12 11
12CVE_PRODUCT = "adiscon:libestr"
13
13inherit autotools 14inherit autotools
diff --git a/meta-oe/recipes-support/libfann/libfann_git.bb b/meta-oe/recipes-support/libfann/libfann_git.bb
index 40f91ac43d..2f68ea95a8 100644
--- a/meta-oe/recipes-support/libfann/libfann_git.bb
+++ b/meta-oe/recipes-support/libfann/libfann_git.bb
@@ -14,6 +14,5 @@ SRC_URI = "git://github.com/libfann/fann.git;branch=master;protocol=https \
14 14
15PV = "2.2.0+git" 15PV = "2.2.0+git"
16 16
17S = "${WORKDIR}/git"
18 17
19EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}" 18EXTRA_OECMAKE = "-DLIB_SUFFIX=${@d.getVar('baselib').replace('lib', '')}"
diff --git a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-oe/recipes-support/libfido2/libfido2_1.16.0.bb
index d453d0ab97..09d34603d6 100644
--- a/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb
+++ b/meta-oe/recipes-support/libfido2/libfido2_1.16.0.bb
@@ -7,10 +7,10 @@ LICENSE = "BSD-2-Clause"
7SECTION = "libs/network" 7SECTION = "libs/network"
8DEPENDS = "libcbor openssl zlib udev" 8DEPENDS = "libcbor openssl zlib udev"
9 9
10LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" 10LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b"
11 11
12SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" 12SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz"
13SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" 13SRC_URI[sha256sum] = "8c2b6fb279b5b42e9ac92ade71832e485852647b53607c43baaafbbcecea04e4"
14 14
15inherit cmake pkgconfig manpages 15inherit cmake pkgconfig manpages
16 16
diff --git a/meta-oe/recipes-support/libftdi/files/0001-CMake-bump-the-minimal-required-version-to-2.8.12.patch b/meta-oe/recipes-support/libftdi/files/0001-CMake-bump-the-minimal-required-version-to-2.8.12.patch
new file mode 100644
index 0000000000..544ea00c35
--- /dev/null
+++ b/meta-oe/recipes-support/libftdi/files/0001-CMake-bump-the-minimal-required-version-to-2.8.12.patch
@@ -0,0 +1,86 @@
1From 9b1419d46b156c3c61d30e761ee3636431187cc0 Mon Sep 17 00:00:00 2001
2From: Yegor Yefremov <yegorslists@googlemail.com>
3Date: Tue, 1 Aug 2023 11:53:35 +0200
4Subject: [PATCH] CMake: bump the minimal required version to 2.8.12
5
6The older CMake versions are deprecated.
7
8Remove support for CMake code compatible with CMake older than 2.8.8.
9
10Also move cmake_minimum_required() command before the project()
11command invocation.
12
13Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
14Upstream-Status: Backport [3861e7dc9e83f2f6ff4e1579cf3bbf63a6827105]
15---
16 CMakeLists.txt | 46 +++++++++++++++++++++-------------------------
17 1 file changed, 21 insertions(+), 25 deletions(-)
18
19diff --git a/CMakeLists.txt b/CMakeLists.txt
20index 3b0b87c..41ddf58 100644
21--- a/CMakeLists.txt
22+++ b/CMakeLists.txt
23@@ -1,3 +1,5 @@
24+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
25+
26 # Project
27 project(libftdi1 C)
28 set(MAJOR_VERSION 1)
29@@ -12,7 +14,6 @@ if("${CMAKE_BUILD_TYPE}" STREQUAL "")
30 set(CMAKE_BUILD_TYPE RelWithDebInfo)
31 endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
32 set(CMAKE_COLOR_MAKEFILE ON)
33-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
34
35 add_definitions(-Wall)
36
37@@ -202,30 +203,25 @@ set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
38
39 set ( LIBFTDI_USE_FILE ${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
40
41-if(CMAKE_VERSION VERSION_LESS 2.8.8)
42- configure_file ( cmake/LibFTDI1Config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
43- configure_file ( cmake/LibFTDI1ConfigVersion.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1ConfigVersion.cmake @ONLY )
44-else ()
45- include(CMakePackageConfigHelpers)
46-
47- configure_package_config_file (
48- cmake/LibFTDI1Config.cmake.in
49- ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
50- INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
51- PATH_VARS
52- LIBFTDI_USE_FILE
53- LIBFTDI_ROOT_DIR
54- LIBFTDI_INCLUDE_DIR
55- LIBFTDI_INCLUDE_DIRS
56- LIBFTDI_LIBRARY_DIRS
57- NO_CHECK_REQUIRED_COMPONENTS_MACRO
58- )
59- write_basic_package_version_file (
60- LibFTDI1ConfigVersion.cmake
61- VERSION ${LIBFTDI_VERSION_STRING}
62- COMPATIBILITY AnyNewerVersion
63- )
64-endif ()
65+include(CMakePackageConfigHelpers)
66+
67+configure_package_config_file (
68+ cmake/LibFTDI1Config.cmake.in
69+ ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
70+ INSTALL_DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
71+ PATH_VARS
72+ LIBFTDI_USE_FILE
73+ LIBFTDI_ROOT_DIR
74+ LIBFTDI_INCLUDE_DIR
75+ LIBFTDI_INCLUDE_DIRS
76+ LIBFTDI_LIBRARY_DIRS
77+ NO_CHECK_REQUIRED_COMPONENTS_MACRO
78+)
79+write_basic_package_version_file (
80+ LibFTDI1ConfigVersion.cmake
81+ VERSION ${LIBFTDI_VERSION_STRING}
82+ COMPATIBILITY AnyNewerVersion
83+)
84
85
86 install ( FILES
diff --git a/meta-oe/recipes-support/libftdi/files/0002-CMake-require-2.8.12-for-cmake_example.patch b/meta-oe/recipes-support/libftdi/files/0002-CMake-require-2.8.12-for-cmake_example.patch
new file mode 100644
index 0000000000..a31a67df88
--- /dev/null
+++ b/meta-oe/recipes-support/libftdi/files/0002-CMake-require-2.8.12-for-cmake_example.patch
@@ -0,0 +1,24 @@
1From 579c08ec00d7cfd72071a86c67fb3b3c5fec5a9e Mon Sep 17 00:00:00 2001
2From: Yegor Yefremov <yegorslists@googlemail.com>
3Date: Thu, 31 Aug 2023 09:23:29 +0200
4Subject: [PATCH] CMake: require 2.8.12 for cmake_example
5
6Make CMake minimal version requirement consistent for the entire
7project.
8
9Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
10Upstream-Status: Backport [61a6bac98bbac623fb33b6153a063b6436f84721]
11---
12 examples/cmake_example/CMakeLists.txt | 2 +-
13 1 file changed, 1 insertion(+), 1 deletion(-)
14
15diff --git a/examples/cmake_example/CMakeLists.txt b/examples/cmake_example/CMakeLists.txt
16index fe203ed..264752d 100644
17--- a/examples/cmake_example/CMakeLists.txt
18+++ b/examples/cmake_example/CMakeLists.txt
19@@ -1,4 +1,4 @@
20-cmake_minimum_required ( VERSION 2.8 )
21+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
22
23 project ( example C )
24
diff --git a/meta-oe/recipes-support/libftdi/files/0003-CMake-bump-the-minimal-required-version-to-3.5.patch b/meta-oe/recipes-support/libftdi/files/0003-CMake-bump-the-minimal-required-version-to-3.5.patch
new file mode 100644
index 0000000000..b541cb69f4
--- /dev/null
+++ b/meta-oe/recipes-support/libftdi/files/0003-CMake-bump-the-minimal-required-version-to-3.5.patch
@@ -0,0 +1,34 @@
1From e6d18a015907b22345bf8994110f68f0609949a9 Mon Sep 17 00:00:00 2001
2From: Yegor Yefremov <yegorslists@googlemail.com>
3Date: Tue, 12 Dec 2023 14:20:36 +0100
4Subject: [PATCH] CMake: bump the minimal required version to 3.5
5
6Older CMake versions are treated as deprecated.
7
8Signed-off-by: Moritz Haase <Moritz.Haase@bmw.de>
9Upstream-Status: Backport [de9f01ece34d2fe6e842e0250a38f4b16eda2429]
10---
11 CMakeLists.txt | 2 +-
12 examples/cmake_example/CMakeLists.txt | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 41ddf58..c37887b 100644
17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt
19@@ -1,4 +1,4 @@
20-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
21+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
22
23 # Project
24 project(libftdi1 C)
25diff --git a/examples/cmake_example/CMakeLists.txt b/examples/cmake_example/CMakeLists.txt
26index 264752d..cbdd2e4 100644
27--- a/examples/cmake_example/CMakeLists.txt
28+++ b/examples/cmake_example/CMakeLists.txt
29@@ -1,4 +1,4 @@
30-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
31+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
32
33 project ( example C )
34
diff --git a/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch
new file mode 100644
index 0000000000..b2735f8059
--- /dev/null
+++ b/meta-oe/recipes-support/libftdi/files/CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch
@@ -0,0 +1,45 @@
1From cdb28383402d248dbc6062f4391b038375c52385 Mon Sep 17 00:00:00 2001
2From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
3Date: Fri, 17 Jul 2020 21:25:03 +0200
4Subject: [PATCH] CMakeLists.txt: fix paths when FTDIPP is set
5
6Use the same project name (i.e. libftdi1 and not libftdipp1) when FTDIPP
7is enabled as suggested by Aurelien Jarno in
8http://developer.intra2net.com/mailarchive/html/libftdi/2020/msg00044.html
9
10Without this change, the libftdi1.pc config file defines the include
11path as /usr/local/include/libftdipp1 while the ftdi.h file is actually
12installed in /usr/local/include/libftdi1
13
14This is an issue for example for libsigrok which will fail on:
15
16In file included from src/hardware/asix-sigma/protocol.c:27:
17src/hardware/asix-sigma/protocol.h:28:10: fatal error: ftdi.h: No such file or directory
18 28 | #include <ftdi.h>
19 | ^~~~~~~~
20
21Fixes:
22 - http://autobuild.buildroot.org/results/1427f44e36752c337791597fab47a1889552a2fe
23
24Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
25Upstream-Status: Backport [http://developer.intra2net.com/git/?p=libftdi;a=patch;h=cdb28383402d248dbc6062f4391b038375c52385]
26---
27 CMakeLists.txt | 2 +-
28 1 files changed, 1 insertions(+), 1 deletions(-)
29
30diff --git a/CMakeLists.txt b/CMakeLists.txt
31index 5aecafc..3b0b87c 100644
32--- a/CMakeLists.txt
33+++ b/CMakeLists.txt
34@@ -136,7 +136,7 @@ endif ()
35
36 add_subdirectory(src)
37 if ( FTDIPP )
38- project(libftdipp1 C CXX)
39+ project(libftdi1 C CXX)
40 add_subdirectory(ftdipp)
41 endif ()
42 if ( PYTHON_BINDINGS )
43--
441.7.1
45
diff --git a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
index eae1c02f04..6faab82ad5 100644
--- a/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
+++ b/meta-oe/recipes-support/libftdi/libftdi_1.5.bb
@@ -4,17 +4,25 @@ including the popular bitbang mode."
4HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/" 4HOMEPAGE = "http://www.intra2net.com/en/developer/libftdi/"
5SECTION = "libs" 5SECTION = "libs"
6LICENSE = "LGPL-2.1-only & GPL-2.0-only" 6LICENSE = "LGPL-2.1-only & GPL-2.0-only"
7LIC_FILES_CHKSUM= "\ 7LIC_FILES_CHKSUM = "\
8 file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \ 8 file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe \
9 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ 9 file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \
10" 10"
11 11
12DEPENDS = "libusb1 python3 swig-native" 12DEPENDS = "libusb1 python3 swig-native"
13 13
14SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" 14SRC_URI = "\
15 http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2 \
16 file://CMakeLists-txt-fix-paths-when-FTDIPP-is-set.patch \
17 file://0001-CMake-bump-the-minimal-required-version-to-2.8.12.patch \
18 file://0002-CMake-require-2.8.12-for-cmake_example.patch \
19 file://0003-CMake-bump-the-minimal-required-version-to-3.5.patch \
20"
15SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" 21SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049"
16 22
17S = "${WORKDIR}/${BPN}1-${PV}" 23UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php"
24
25S = "${UNPACKDIR}/${BPN}1-${PV}"
18 26
19inherit cmake binconfig pkgconfig python3native 27inherit cmake binconfig pkgconfig python3native
20 28
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
deleted file mode 100644
index ac1eff510b..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch
+++ /dev/null
@@ -1,530 +0,0 @@
1From 0d3e1b3923a1fac80e9d75d8b5e33cd36f4fe659 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 31 May 2024 09:03:22 -0700
4Subject: [PATCH] bindings: cxx: Migrate C++ tests to use Catch2 v3
5
6Catch2 v3.x has API changes which needs to be addressed
7in the tests themselves, hence this changeset is to fix
8those.
9
10Upstream-Status: Submitted [https://lore.kernel.org/linux-gpio/20240531184223.3949069-1-raj.khem@gmail.com/T/#u]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Cc: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
13---
14 bindings/cxx/tests/Makefile.am | 2 +-
15 bindings/cxx/tests/gpiod-cxx-test-main.cpp | 3 +--
16 bindings/cxx/tests/helpers.hpp | 8 +++---
17 bindings/cxx/tests/tests-chip-info.cpp | 30 ++++++++++-----------
18 bindings/cxx/tests/tests-chip.cpp | 14 +++++-----
19 bindings/cxx/tests/tests-edge-event.cpp | 2 +-
20 bindings/cxx/tests/tests-info-event.cpp | 2 +-
21 bindings/cxx/tests/tests-line-config.cpp | 2 +-
22 bindings/cxx/tests/tests-line-info.cpp | 22 +++++++--------
23 bindings/cxx/tests/tests-line-request.cpp | 16 +++++------
24 bindings/cxx/tests/tests-line-settings.cpp | 2 +-
25 bindings/cxx/tests/tests-line.cpp | 2 +-
26 bindings/cxx/tests/tests-misc.cpp | 2 +-
27 bindings/cxx/tests/tests-request-config.cpp | 10 +++----
28 configure.ac | 4 +--
29 15 files changed, 60 insertions(+), 61 deletions(-)
30
31diff --git a/bindings/cxx/tests/Makefile.am b/bindings/cxx/tests/Makefile.am
32index fbf80a1..d9284da 100644
33--- a/bindings/cxx/tests/Makefile.am
34+++ b/bindings/cxx/tests/Makefile.am
35@@ -4,7 +4,7 @@
36 AM_CXXFLAGS = -I$(top_srcdir)/bindings/cxx/ -I$(top_srcdir)/include
37 AM_CXXFLAGS += -I$(top_srcdir)/tests/gpiosim/
38 AM_CXXFLAGS += -Wall -Wextra -g -std=gnu++17 $(CATCH2_CFLAGS)
39-AM_LDFLAGS = -pthread
40+AM_LDFLAGS = -pthread $(CATCH2_LIBS)
41 LDADD = $(top_builddir)/bindings/cxx/libgpiodcxx.la
42 LDADD += $(top_builddir)/tests/gpiosim/libgpiosim.la
43
44diff --git a/bindings/cxx/tests/gpiod-cxx-test-main.cpp b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
45index 11bf8e5..ec48286 100644
46--- a/bindings/cxx/tests/gpiod-cxx-test-main.cpp
47+++ b/bindings/cxx/tests/gpiod-cxx-test-main.cpp
48@@ -1,5 +1,4 @@
49 // SPDX-License-Identifier: GPL-2.0-or-later
50 // SPDX-FileCopyrightText: 2017-2021 Bartosz Golaszewski <bartekgola@gmail.com>
51
52-#define CATCH_CONFIG_MAIN
53-#include <catch2/catch.hpp>
54+#include <catch2/catch_all.hpp>
55diff --git a/bindings/cxx/tests/helpers.hpp b/bindings/cxx/tests/helpers.hpp
56index 62d9827..62bbdf5 100644
57--- a/bindings/cxx/tests/helpers.hpp
58+++ b/bindings/cxx/tests/helpers.hpp
59@@ -4,13 +4,13 @@
60 #ifndef __GPIOD_CXX_TEST_HELPERS_HPP__
61 #define __GPIOD_CXX_TEST_HELPERS_HPP__
62
63-#include <catch2/catch.hpp>
64+#include <catch2/catch_all.hpp>
65 #include <regex>
66 #include <string>
67 #include <sstream>
68 #include <system_error>
69
70-class system_error_matcher : public Catch::MatcherBase<::std::system_error>
71+class system_error_matcher : public Catch::Matchers::MatcherBase<::std::system_error>
72 {
73 public:
74 explicit system_error_matcher(int expected_errno);
75@@ -21,7 +21,7 @@ private:
76 ::std::error_condition _m_cond;
77 };
78
79-class regex_matcher : public Catch::MatcherBase<::std::string>
80+class regex_matcher : public Catch::Matchers::MatcherBase<::std::string>
81 {
82 public:
83 explicit regex_matcher(const ::std::string& pattern);
84@@ -33,7 +33,7 @@ private:
85 ::std::string _m_repr;
86 };
87
88-template<class T> class stringify_matcher : public Catch::MatcherBase<T>
89+template<class T> class stringify_matcher : public Catch::Matchers::MatcherBase<T>
90 {
91 public:
92 explicit stringify_matcher(const ::std::string& expected) : _m_expected(expected)
93diff --git a/bindings/cxx/tests/tests-chip-info.cpp b/bindings/cxx/tests/tests-chip-info.cpp
94index 717c387..2c54f53 100644
95--- a/bindings/cxx/tests/tests-chip-info.cpp
96+++ b/bindings/cxx/tests/tests-chip-info.cpp
97@@ -1,7 +1,7 @@
98 // SPDX-License-Identifier: GPL-2.0-or-later
99 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
100
101-#include <catch2/catch.hpp>
102+#include <catch2/catch_all.hpp>
103 #include <gpiod.hpp>
104 #include <sstream>
105
106@@ -24,12 +24,12 @@ TEST_CASE("chip_info properties can be read", "[chip-info][chip]")
107
108 SECTION("get chip name")
109 {
110- REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
111+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
112 }
113
114 SECTION("get chip label")
115 {
116- REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
117+ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
118 }
119
120 SECTION("get num_lines")
121@@ -52,12 +52,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
122 {
123 auto copy(info);
124
125- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
126- REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
127+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
128+ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
129 REQUIRE(copy.num_lines() == 4);
130
131- REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
132- REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
133+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
134+ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
135 REQUIRE(info.num_lines() == 4);
136 }
137
138@@ -67,12 +67,12 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
139
140 copy = info;
141
142- REQUIRE_THAT(copy.name(), Catch::Equals(sim.name()));
143- REQUIRE_THAT(copy.label(), Catch::Equals("foobar"));
144+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals(sim.name()));
145+ REQUIRE_THAT(copy.label(), Catch::Matchers::Equals("foobar"));
146 REQUIRE(copy.num_lines() == 4);
147
148- REQUIRE_THAT(info.name(), Catch::Equals(sim.name()));
149- REQUIRE_THAT(info.label(), Catch::Equals("foobar"));
150+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals(sim.name()));
151+ REQUIRE_THAT(info.label(), Catch::Matchers::Equals("foobar"));
152 REQUIRE(info.num_lines() == 4);
153 }
154
155@@ -80,8 +80,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
156 {
157 auto moved(std::move(info));
158
159- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
160- REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
161+ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
162+ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
163 REQUIRE(moved.num_lines() == 4);
164 }
165
166@@ -91,8 +91,8 @@ TEST_CASE("chip_info can be copied and moved", "[chip-info]")
167
168 moved = ::std::move(info);
169
170- REQUIRE_THAT(moved.name(), Catch::Equals(sim.name()));
171- REQUIRE_THAT(moved.label(), Catch::Equals("foobar"));
172+ REQUIRE_THAT(moved.name(), Catch::Matchers::Equals(sim.name()));
173+ REQUIRE_THAT(moved.label(), Catch::Matchers::Equals("foobar"));
174 REQUIRE(moved.num_lines() == 4);
175 }
176 }
177diff --git a/bindings/cxx/tests/tests-chip.cpp b/bindings/cxx/tests/tests-chip.cpp
178index c5ec19b..1ab7add 100644
179--- a/bindings/cxx/tests/tests-chip.cpp
180+++ b/bindings/cxx/tests/tests-chip.cpp
181@@ -1,7 +1,7 @@
182 // SPDX-License-Identifier: GPL-2.0-or-later
183 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
184
185-#include <catch2/catch.hpp>
186+#include <catch2/catch_all.hpp>
187 #include <gpiod.hpp>
188 #include <sstream>
189 #include <system_error>
190@@ -48,9 +48,9 @@ TEST_CASE("chip constructor works", "[chip]")
191 .build();
192
193 ::gpiod::chip first(sim.dev_path());
194- REQUIRE_THAT(first.get_info().label(), Catch::Equals("foobar"));
195+ REQUIRE_THAT(first.get_info().label(), Catch::Matchers::Equals("foobar"));
196 ::gpiod::chip second(::std::move(first));
197- REQUIRE_THAT(second.get_info().label(), Catch::Equals("foobar"));
198+ REQUIRE_THAT(second.get_info().label(), Catch::Matchers::Equals("foobar"));
199 }
200 }
201
202@@ -70,9 +70,9 @@ TEST_CASE("chip operators work", "[chip]")
203
204 ::gpiod::chip moved_chip(moved_sim.dev_path());
205
206- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("foobar"));
207+ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("foobar"));
208 chip = ::std::move(moved_chip);
209- REQUIRE_THAT(chip.get_info().label(), Catch::Equals("moved"));
210+ REQUIRE_THAT(chip.get_info().label(), Catch::Matchers::Equals("moved"));
211 }
212
213 SECTION("boolean operator")
214@@ -94,7 +94,7 @@ TEST_CASE("chip properties can be read", "[chip]")
215
216 SECTION("get device path")
217 {
218- REQUIRE_THAT(chip.path(), Catch::Equals(sim.dev_path()));
219+ REQUIRE_THAT(chip.path(), Catch::Matchers::Equals(sim.dev_path()));
220 }
221
222 SECTION("get file descriptor")
223@@ -169,7 +169,7 @@ TEST_CASE("stream insertion operator works for chip", "[chip]")
224 "\", label=\"foobar\", num_lines=4))";
225
226 buf << chip;
227- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
228+ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
229 }
230
231 SECTION("closed chip")
232diff --git a/bindings/cxx/tests/tests-edge-event.cpp b/bindings/cxx/tests/tests-edge-event.cpp
233index 19a6ab3..db387be 100644
234--- a/bindings/cxx/tests/tests-edge-event.cpp
235+++ b/bindings/cxx/tests/tests-edge-event.cpp
236@@ -1,7 +1,7 @@
237 // SPDX-License-Identifier: GPL-2.0-or-later
238 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
239
240-#include <catch2/catch.hpp>
241+#include <catch2/catch_all.hpp>
242 #include <chrono>
243 #include <gpiod.hpp>
244 #include <sstream>
245diff --git a/bindings/cxx/tests/tests-info-event.cpp b/bindings/cxx/tests/tests-info-event.cpp
246index 21c0ef0..f7ae309 100644
247--- a/bindings/cxx/tests/tests-info-event.cpp
248+++ b/bindings/cxx/tests/tests-info-event.cpp
249@@ -1,7 +1,7 @@
250 // SPDX-License-Identifier: GPL-2.0-or-later
251 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
252
253-#include <catch2/catch.hpp>
254+#include <catch2/catch_all.hpp>
255 #include <chrono>
256 #include <filesystem>
257 #include <gpiod.hpp>
258diff --git a/bindings/cxx/tests/tests-line-config.cpp b/bindings/cxx/tests/tests-line-config.cpp
259index 5e439a1..2f510fb 100644
260--- a/bindings/cxx/tests/tests-line-config.cpp
261+++ b/bindings/cxx/tests/tests-line-config.cpp
262@@ -1,7 +1,7 @@
263 // SPDX-License-Identifier: GPL-2.0-or-later
264 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
265
266-#include <catch2/catch.hpp>
267+#include <catch2/catch_all.hpp>
268 #include <gpiod.hpp>
269
270 #include "gpiosim.hpp"
271diff --git a/bindings/cxx/tests/tests-line-info.cpp b/bindings/cxx/tests/tests-line-info.cpp
272index 21211f2..8589da3 100644
273--- a/bindings/cxx/tests/tests-line-info.cpp
274+++ b/bindings/cxx/tests/tests-line-info.cpp
275@@ -1,7 +1,7 @@
276 // SPDX-License-Identifier: GPL-2.0-or-later
277 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
278
279-#include <catch2/catch.hpp>
280+#include <catch2/catch_all.hpp>
281 #include <gpiod.hpp>
282 #include <string>
283
284@@ -35,9 +35,9 @@ TEST_CASE("get_line_info() works", "[chip][line-info]")
285 auto info = chip.get_line_info(0);
286
287 REQUIRE(info.offset() == 0);
288- REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
289+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
290 REQUIRE(info.used());
291- REQUIRE_THAT(info.consumer(), Catch::Equals("hog"));
292+ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("hog"));
293 REQUIRE(info.direction() == ::gpiod::line::direction::OUTPUT);
294 REQUIRE_FALSE(info.active_low());
295 REQUIRE(info.bias() == ::gpiod::line::bias::UNKNOWN);
296@@ -74,9 +74,9 @@ TEST_CASE("line properties can be retrieved", "[line-info]")
297 auto info6 = chip.get_line_info(6);
298
299 REQUIRE(info4.offset() == 4);
300- REQUIRE_THAT(info4.name(), Catch::Equals("baz"));
301+ REQUIRE_THAT(info4.name(), Catch::Matchers::Equals("baz"));
302 REQUIRE(info4.used());
303- REQUIRE_THAT(info4.consumer(), Catch::Equals("hog4"));
304+ REQUIRE_THAT(info4.consumer(), Catch::Matchers::Equals("hog4"));
305 REQUIRE(info4.direction() == direction::OUTPUT);
306 REQUIRE(info4.edge_detection() == edge::NONE);
307 REQUIRE_FALSE(info4.active_low());
308@@ -102,10 +102,10 @@ TEST_CASE("line_info can be copied and moved")
309 {
310 auto copy(info);
311 REQUIRE(copy.offset() == 2);
312- REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
313+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
314 /* info can still be used */
315 REQUIRE(info.offset() == 2);
316- REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
317+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
318 }
319
320 SECTION("assignment operator works")
321@@ -113,17 +113,17 @@ TEST_CASE("line_info can be copied and moved")
322 auto copy = chip.get_line_info(0);
323 copy = info;
324 REQUIRE(copy.offset() == 2);
325- REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
326+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
327 /* info can still be used */
328 REQUIRE(info.offset() == 2);
329- REQUIRE_THAT(info.name(), Catch::Equals("foobar"));
330+ REQUIRE_THAT(info.name(), Catch::Matchers::Equals("foobar"));
331 }
332
333 SECTION("move constructor works")
334 {
335 auto copy(::std::move(info));
336 REQUIRE(copy.offset() == 2);
337- REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
338+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
339 }
340
341 SECTION("move assignment operator works")
342@@ -131,7 +131,7 @@ TEST_CASE("line_info can be copied and moved")
343 auto copy = chip.get_line_info(0);
344 copy = ::std::move(info);
345 REQUIRE(copy.offset() == 2);
346- REQUIRE_THAT(copy.name(), Catch::Equals("foobar"));
347+ REQUIRE_THAT(copy.name(), Catch::Matchers::Equals("foobar"));
348 }
349 }
350
351diff --git a/bindings/cxx/tests/tests-line-request.cpp b/bindings/cxx/tests/tests-line-request.cpp
352index 9632ae0..af8b979 100644
353--- a/bindings/cxx/tests/tests-line-request.cpp
354+++ b/bindings/cxx/tests/tests-line-request.cpp
355@@ -1,7 +1,7 @@
356 // SPDX-License-Identifier: GPL-2.0-or-later
357 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
358
359-#include <catch2/catch.hpp>
360+#include <catch2/catch_all.hpp>
361 #include <gpiod.hpp>
362 #include <sstream>
363 #include <stdexcept>
364@@ -20,7 +20,7 @@ using pull = ::gpiosim::chip::pull;
365
366 namespace {
367
368-class value_matcher : public Catch::MatcherBase<value>
369+class value_matcher : public Catch::Matchers::MatcherBase<value>
370 {
371 public:
372 value_matcher(pull pull, bool active_low = false)
373@@ -117,7 +117,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
374 auto info = chip.get_line_info(2);
375
376 REQUIRE(info.used());
377- REQUIRE_THAT(info.consumer(), Catch::Equals("foobar"));
378+ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("foobar"));
379 }
380
381 SECTION("empty consumer")
382@@ -130,7 +130,7 @@ TEST_CASE("consumer string is set correctly", "[line-request]")
383 auto info = chip.get_line_info(2);
384
385 REQUIRE(info.used());
386- REQUIRE_THAT(info.consumer(), Catch::Equals("?"));
387+ REQUIRE_THAT(info.consumer(), Catch::Matchers::Equals("?"));
388 }
389 }
390
391@@ -380,7 +380,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
392 auto moved(::std::move(request));
393
394 REQUIRE(moved.fd() == fd);
395- REQUIRE_THAT(moved.offsets(), Catch::Equals(offs));
396+ REQUIRE_THAT(moved.offsets(), Catch::Matchers::Equals(offs));
397 }
398
399 SECTION("move assignment operator works")
400@@ -388,7 +388,7 @@ TEST_CASE("line_request can be moved", "[line-request]")
401 another = ::std::move(request);
402
403 REQUIRE(another.fd() == fd);
404- REQUIRE_THAT(another.offsets(), Catch::Equals(offs));
405+ REQUIRE_THAT(another.offsets(), Catch::Matchers::Equals(offs));
406 }
407 }
408
409@@ -484,7 +484,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
410 {
411 buf << request;
412
413- REQUIRE_THAT(buf.str(), Catch::Equals(expected.str()));
414+ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected.str()));
415 }
416
417 SECTION("request released")
418@@ -493,7 +493,7 @@ TEST_CASE("line_request stream insertion operator works", "[line-request]")
419
420 buf << request;
421
422- REQUIRE_THAT(buf.str(), Catch::Equals("gpiod::line_request(released)"));
423+ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals("gpiod::line_request(released)"));
424 }
425 }
426
427diff --git a/bindings/cxx/tests/tests-line-settings.cpp b/bindings/cxx/tests/tests-line-settings.cpp
428index dc821bb..2690331 100644
429--- a/bindings/cxx/tests/tests-line-settings.cpp
430+++ b/bindings/cxx/tests/tests-line-settings.cpp
431@@ -1,7 +1,7 @@
432 // SPDX-License-Identifier: GPL-2.0-or-later
433 // SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <brgl@bgdev.pl>
434
435-#include <catch2/catch.hpp>
436+#include <catch2/catch_all.hpp>
437 #include <gpiod.hpp>
438
439 #include "helpers.hpp"
440diff --git a/bindings/cxx/tests/tests-line.cpp b/bindings/cxx/tests/tests-line.cpp
441index 319012a..abd0e08 100644
442--- a/bindings/cxx/tests/tests-line.cpp
443+++ b/bindings/cxx/tests/tests-line.cpp
444@@ -1,7 +1,7 @@
445 // SPDX-License-Identifier: GPL-2.0-or-later
446 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
447
448-#include <catch2/catch.hpp>
449+#include <catch2/catch_all.hpp>
450 #include <gpiod.hpp>
451
452 #include "helpers.hpp"
453diff --git a/bindings/cxx/tests/tests-misc.cpp b/bindings/cxx/tests/tests-misc.cpp
454index f06dc39..33fc3fa 100644
455--- a/bindings/cxx/tests/tests-misc.cpp
456+++ b/bindings/cxx/tests/tests-misc.cpp
457@@ -1,7 +1,7 @@
458 // SPDX-License-Identifier: GPL-2.0-or-later
459 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
460
461-#include <catch2/catch.hpp>
462+#include <catch2/catch_all.hpp>
463 #include <filesystem>
464 #include <gpiod.hpp>
465 #include <string>
466diff --git a/bindings/cxx/tests/tests-request-config.cpp b/bindings/cxx/tests/tests-request-config.cpp
467index 66eb748..d71e91b 100644
468--- a/bindings/cxx/tests/tests-request-config.cpp
469+++ b/bindings/cxx/tests/tests-request-config.cpp
470@@ -1,7 +1,7 @@
471 // SPDX-License-Identifier: GPL-2.0-or-later
472 // SPDX-FileCopyrightText: 2021-2022 Bartosz Golaszewski <brgl@bgdev.pl>
473
474-#include <catch2/catch.hpp>
475+#include <catch2/catch_all.hpp>
476 #include <cstddef>
477 #include <gpiod.hpp>
478 #include <string>
479@@ -33,7 +33,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
480 SECTION("move constructor works")
481 {
482 auto moved(::std::move(cfg));
483- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
484+ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
485 REQUIRE(moved.event_buffer_size() == 64);
486 }
487
488@@ -43,7 +43,7 @@ TEST_CASE("request_config can be moved", "[request-config]")
489
490 moved = ::std::move(cfg);
491
492- REQUIRE_THAT(moved.consumer(), Catch::Equals("foobar"));
493+ REQUIRE_THAT(moved.consumer(), Catch::Matchers::Equals("foobar"));
494 REQUIRE(moved.event_buffer_size() == 64);
495 }
496 }
497@@ -55,7 +55,7 @@ TEST_CASE("request_config mutators work", "[request-config]")
498 SECTION("set consumer")
499 {
500 cfg.set_consumer("foobar");
501- REQUIRE_THAT(cfg.consumer(), Catch::Equals("foobar"));
502+ REQUIRE_THAT(cfg.consumer(), Catch::Matchers::Equals("foobar"));
503 }
504
505 SECTION("set event_buffer_size")
506@@ -77,7 +77,7 @@ TEST_CASE("request_config stream insertion operator works", "[request-config]")
507
508 ::std::string expected("gpiod::request_config(consumer='foobar', event_buffer_size=32)");
509
510- REQUIRE_THAT(buf.str(), Catch::Equals(expected));
511+ REQUIRE_THAT(buf.str(), Catch::Matchers::Equals(expected));
512 }
513
514 } /* namespace */
515diff --git a/configure.ac b/configure.ac
516index a2370c5..216007e 100644
517--- a/configure.ac
518+++ b/configure.ac
519@@ -206,9 +206,9 @@ then
520
521 if test "x$with_tests" = xtrue
522 then
523- PKG_CHECK_MODULES([CATCH2], [catch2],, [
524+ PKG_CHECK_MODULES([CATCH2], [catch2-with-main],, [
525 AC_LANG_PUSH([C++])
526- AC_CHECK_HEADERS([catch2/catch.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch.hpp])])
527+ AC_CHECK_HEADERS([catch2/catch_all.hpp], [], [HEADER_NOT_FOUND_CXX([catch2/catch_all.hpp])])
528 AC_LANG_POP([C++])
529 ])
530 fi
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
new file mode 100644
index 0000000000..e36755eea2
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/gpio-manager.init
@@ -0,0 +1,76 @@
1#! /bin/sh
2### BEGIN INIT INFO
3# Provides: gpio-manager
4# Required-Start: $remote_fs $syslog
5# Required-Stop: $remote_fs $syslog
6# Default-Start: 2 3 4 5
7# Default-Stop: 1
8# Short-Description: Centralized GPIO manager daemon
9### END INIT INFO
10#
11# -*- coding: utf-8 -*-
12# Debian init.d script for gpio-manager
13# Copyright (c) 2024 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
14
15# set -e
16
17# Source function library.
18. /etc/init.d/functions
19
20DAEMON=/usr/bin/gpio-manager
21NAME=gpio-manager
22PIDFILE=/var/run/gpio-manager/pid
23DESC="GPIO manager daemon"
24
25test -x $DAEMON || exit 0
26test "$ENABLED" != "0" || exit 0
27
28do_start()
29{
30 mkdir -p "`dirname $PIDFILE`"
31 if [ -e $PIDFILE ]; then
32 PIDDIR=/proc/$(cat $PIDFILE)
33 if [ -d ${PIDDIR} -a "$(readlink -f ${PIDDIR}/exe)" = "${DAEMON}" ]; then
34 echo "$DESC already started; not starting."
35 else
36 echo "Removing stale PID file $PIDFILE."
37 rm -f $PIDFILE
38 fi
39 fi
40
41 echo -n "Starting $DESC: "
42 start-stop-daemon --user gpio-manager --background --start --quiet --make-pidfile --pidfile $PIDFILE --exec $DAEMON
43 echo "$NAME."
44}
45
46do_stop()
47{
48 echo -n "Stopping $DESC: "
49 start-stop-daemon --stop --quiet --pidfile $PIDFILE
50 echo "$NAME."
51 rm -f $PIDFILE
52}
53
54case "$1" in
55 start)
56 do_start
57 ;;
58 stop)
59 do_stop
60 ;;
61 status)
62 status $DAEMON
63 exit $?
64 ;;
65 restart)
66 do_stop
67 sleep 1
68 do_start
69 ;;
70 *)
71 echo "Usage: /etc/init.d/$NAME {start|stop|status|restart}" >&2
72 exit 1
73 ;;
74esac
75
76exit 0
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
index 29ec0d1027..eae172116f 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
+++ b/meta-oe/recipes-support/libgpiod/libgpiod-2.x/run-ptest
@@ -1,24 +1,43 @@
1#!/bin/sh 1#!/bin/sh
2 2
3testbins="gpiod-test gpio-tools-test.bash gpiod-cxx-test"
4
5ptestdir=$(dirname "$(readlink -f "$0")") 3ptestdir=$(dirname "$(readlink -f "$0")")
6cd $ptestdir/tests 4cd $ptestdir/tests
7 5
6export GPIODBUS_TEST_DAEMON_PATH="$ptestdir/tests/gpio-manager"
7export PATH="$ptestdir/tests/:$PATH"
8
8# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to 9# libgpiod v2 uses gpio-sim - a configfs-based testing module. We need to
9# make sure configfs is mounted before running any tests. 10# make sure configfs is mounted before running any tests.
10modprobe configfs 11modprobe configfs
11mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config 12mountpoint /sys/kernel/config > /dev/null || mount -t configfs configfs /sys/kernel/config
12 13
13for testbin in $testbins; do 14# Make sure the daemon is not running during tests.
14 if test -e ./$testbin; then 15systemctl stop gpio-manager 2> /dev/null > /dev/null
15 ./$testbin > ./$testbin.out 2>&1 16service gpio-manager stop 2> /dev/null > /dev/null
16 if [ $? -ne 0 ]; then 17
17 echo "FAIL: $testbin" 18run_one_test() {
18 else 19 testbin="$1"
19 echo "PASS: $testbin" 20
20 fi 21 ./$testbin > ./$testbin.out 2>&1
22 if [ $? -ne 0 ]; then
23 echo "FAIL: $testbin"
21 else 24 else
22 echo "SKIP: $testbin" 25 echo "PASS: $testbin"
23 fi 26 fi
24done 27}
28
29run_one_test gpiod-test
30run_one_test gpio-tools-test.bash
31run_one_test gpiod-cxx-test
32run_one_test gpiod-glib-test
33
34# Wait for the leftover uevents to be emitted before running DBus tests.
35udevadm settle
36run_one_test gpiodbus-test
37
38udevadm settle
39gpio-manager 2> /dev/null > /dev/null &
40GPIO_MANAGER_PID=$!
41run_one_test gpiocli-test.bash
42kill $GPIO_MANAGER_PID
43wait $GPIO_MANAGER_PID
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod.inc b/meta-oe/recipes-support/libgpiod/libgpiod.inc
index 7b68f77d20..fb309c5644 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod.inc
+++ b/meta-oe/recipes-support/libgpiod/libgpiod.inc
@@ -53,4 +53,3 @@ do_install_ptest() {
53 install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ 53 install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/
54 done 54 done
55} 55}
56
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
index 0795839492..009cf9897a 100644
--- a/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_1.6.5.bb
@@ -7,17 +7,13 @@ SRC_URI += "file://0001-bindings-cxx-disable-tests.patch"
7 7
8SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc" 8SRC_URI[sha256sum] = "ae280f697bf035a1fb780c9972e5c81d0d2712b7ab6124fb3fba24619daa72bc"
9 9
10FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-1.x:" 10FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-1.x:"
11 11
12inherit python3native 12inherit python3native
13 13
14PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" 14PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2"
15PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" 15PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3"
16 16
17# Always build tools - they don't have any additional
18# requirements over the library.
19EXTRA_OECONF = "--enable-tools"
20
21PACKAGES =+ "${PN}-python" 17PACKAGES =+ "${PN}-python"
22FILES:${PN}-tools += "${bindir}/gpiofind" 18FILES:${PN}-tools += "${bindir}/gpiofind"
23FILES:${PN}-ptest += " \ 19FILES:${PN}-ptest += " \
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
deleted file mode 100644
index b4665c1567..0000000000
--- a/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb
+++ /dev/null
@@ -1,33 +0,0 @@
1require libgpiod.inc
2
3LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
4LIC_FILES_CHKSUM = " \
5 file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
6 file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
7 file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
8"
9
10FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:"
11
12SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch"
13SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548"
14
15# Enable all project features for ptest
16PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit"
17PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
18
19PACKAGES =+ "${PN}-ptest-dev"
20FILES:${PN}-tools += "${bindir}/gpionotify"
21FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*"
22FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h"
23
24RDEPENDS:${PN}-ptest += " \
25 ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
26"
27RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
28
29do_install_ptest:append() {
30 install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
31 install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
32 install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
33}
diff --git a/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb
new file mode 100644
index 0000000000..93c3e3b92d
--- /dev/null
+++ b/meta-oe/recipes-support/libgpiod/libgpiod_2.2.1.bb
@@ -0,0 +1,104 @@
1require libgpiod.inc
2
3inherit systemd update-rc.d useradd gobject-introspection
4
5LICENSE = "GPL-2.0-or-later & LGPL-2.1-or-later & CC-BY-SA-4.0"
6LIC_FILES_CHKSUM = " \
7 file://LICENSES/GPL-2.0-or-later.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
8 file://LICENSES/LGPL-2.1-or-later.txt;md5=4b54a1fd55a448865a0b32d41598759d \
9 file://LICENSES/CC-BY-SA-4.0.txt;md5=fba3b94d88bfb9b81369b869a1e9a20f \
10"
11
12FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}-2.x:"
13
14SRC_URI += "file://gpio-manager.init"
15
16SRC_URI[sha256sum] = "0e948049c309b87c220fb24ee0d605d7cd5b72f22376e608470903fffa2d4b18"
17
18# Enable all project features for ptest
19PACKAGECONFIG[tests] = " \
20 --enable-tests --enable-tools --enable-bindings-cxx --enable-bindings-glib --enable-gpioset-interactive --enable-dbus, \
21 --disable-tests, \
22 kmod util-linux glib-2.0 catch2 libedit glib-2.0-native libgudev, \
23 bash ${VIRTUAL-RUNTIME_dbus} glib-2.0-utils libgpiod-manager-cfg shunit2 \
24"
25PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
26PACKAGECONFIG[glib] = "--enable-bindings-glib,--disable-bindings-glib,glib-2.0 glib-2.0-native"
27PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,glib-2.0 glib-2.0-native libgudev,${VIRTUAL-RUNTIME_dbus}"
28
29PACKAGES =+ "${PN}-gpiosim ${PN}-glib ${PN}-manager ${PN}-manager-cfg ${PN}-cli"
30FILES:${PN}-tools += "${bindir}/gpionotify"
31FILES:${PN}-gpiosim += "${libdir}/libgpiosim.so.*"
32FILES:${PN}-gpiosim-dev += "${includedir}/gpiosim.h"
33FILES:${PN}-glib += "${libdir}/libgpiod-glib.so.*"
34FILES:${PN}-manager += " \
35 ${bindir}/gpio-manager \
36 ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/gpio-manager.service', '', d)} \
37 ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/init.d/gpio-manager', '', d)} \
38"
39FILES:${PN}-manager-cfg += " \
40 ${sysconfdir}/dbus-1/system.d/io.gpiod1.conf \
41 ${datadir}/dbus-1/interfaces/io.gpiod1.xml \
42 ${nonarch_base_libdir}/udev/rules.d/90-gpio.rules \
43"
44FILES:${PN}-cli += "${bindir}/gpiocli"
45
46RDEPENDS:${PN}-manager += "${VIRTUAL-RUNTIME_dbus} ${PN}-manager-cfg"
47RDEPENDS:${PN}-cli += "${PN}-manager"
48
49SYSTEMD_PACKAGES = "${PN}-manager"
50
51python __anonymous() {
52 distro_features = d.getVar("DISTRO_FEATURES").split()
53 packageconfig = d.getVar("PACKAGECONFIG").split()
54 pn = d.getVar("PN")
55
56 if "systemd" in distro_features and "dbus" in packageconfig:
57 d.appendVar("EXTRA_OECONF", " --enable-systemd")
58 # We need to set it conditionally or else the systemd class will look
59 # for the file that we don't install with systemd support disabled.
60 d.setVar("SYSTEMD_SERVICE:{}-manager".format(pn), "gpio-manager.service")
61 else:
62 d.appendVar("EXTRA_OECONF", " --disable-systemd")
63
64 # Disable gobject introspection set by the bbclass if we don't want it.
65 if not any(cfg in ["glib", "dbus", "ptest"] for cfg in packageconfig):
66 d.setVar("GI_DATA_ENABLED", "False")
67}
68
69UPDATERCPN = "${PN}-manager"
70INITSCRIPT_NAME = "gpio-manager"
71INITSCRIPT_PARAMS = "start 20 2 3 4 5 . stop 20 0 1 6 ."
72
73USERADD_PACKAGES = "${PN}-manager"
74GROUPADD_PARAM:${PN}-manager = "--system gpio"
75USERADD_PARAM:${PN}-manager = "--system -M -s /bin/nologin -g gpio gpio-manager"
76
77RDEPENDS:${PN}-ptest += " \
78 ${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
79"
80RRECOMMENDS:${PN}-gpiosim += "kernel-module-gpio-sim kernel-module-configfs"
81INSANE_SKIP:${PN}-ptest += "buildpaths"
82
83do_compile:prepend() {
84 export GIR_EXTRA_LIBS_PATH="${B}/lib/.libs"
85}
86
87do_install:append() {
88 if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then
89 install -d ${D}${sysconfdir}/init.d
90 install -m 0755 ${UNPACKDIR}/gpio-manager.init ${D}${sysconfdir}/init.d/gpio-manager
91 fi
92}
93
94do_install_ptest:append() {
95 install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/
96 install -m 0755 ${S}/tools/gpio-tools-test.bash ${D}${PTEST_PATH}/tests/
97 install -m 0644 ${S}/tests/scripts/gpiod-bash-test-helper.inc ${D}${PTEST_PATH}/tests/
98 install -m 0644 ${S}/tests/gpiosim/gpiosim.h ${D}${includedir}/gpiosim.h
99 install -m 0755 ${B}/bindings/glib/tests/.libs/gpiod-glib-test ${D}${PTEST_PATH}/tests/
100 install -m 0755 ${B}/dbus/tests/.libs/gpiodbus-test ${D}${PTEST_PATH}/tests/
101 install -m 0755 ${S}/dbus/client/gpiocli-test.bash ${D}${PTEST_PATH}/tests/
102 install -m 0755 ${B}/dbus/manager/.libs/gpio-manager ${D}${PTEST_PATH}/tests/
103 install -m 0755 ${B}/dbus/client/.libs/gpiocli ${D}${PTEST_PATH}/tests/
104}
diff --git a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb b/meta-oe/recipes-support/libgusb/libgusb_0.4.9.bb
index 491b6a7a1d..9007574fc6 100644
--- a/meta-oe/recipes-support/libgusb/libgusb_0.3.10.bb
+++ b/meta-oe/recipes-support/libgusb/libgusb_0.4.9.bb
@@ -2,17 +2,19 @@ SUMMARY = "GUsb is a GObject wrapper for libusb1"
2LICENSE = "LGPL-2.1-only" 2LICENSE = "LGPL-2.1-only"
3LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" 3LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1"
4 4
5DEPENDS = "glib-2.0 libusb" 5DEPENDS = "glib-2.0 libusb json-glib"
6RDEPENDS:${PN} = "hwdata"
6 7
7inherit meson gobject-introspection gtk-doc gettext vala 8inherit meson gobject-introspection gi-docgen gettext vala pkgconfig
8 9
9PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}" 10PACKAGECONFIG:class-target ??= "${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)}"
10PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false" 11PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false"
11 12
12EXTRA_OEMESON:append:class-native = " -Dtests=false -Dintrospection=false" 13EXTRA_OEMESON:class-native += "-Dtests=false -Dintrospection=false"
14
15GIDOCGEN_MESON_OPTION = 'docs'
13 16
14SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https" 17SRC_URI = "git://github.com/hughsie/libgusb.git;branch=main;protocol=https"
15SRCREV = "332d5b987ffecb824426e88518e05547faf2b520" 18SRCREV = "ed31c8134d80d006bd45450e84180be2a7c0742e"
16S = "${WORKDIR}/git"
17 19
18BBCLASSEXTEND = "native" 20BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb b/meta-oe/recipes-support/libharu/libharu_2.4.5.bb
index 02dc499e03..0ad4bd92c0 100644
--- a/meta-oe/recipes-support/libharu/libharu_2.4.4.bb
+++ b/meta-oe/recipes-support/libharu/libharu_2.4.5.bb
@@ -9,8 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=924546dab2bef90e370d7c0c090ddcf0"
9DEPENDS += "libpng zlib" 9DEPENDS += "libpng zlib"
10 10
11SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https" 11SRC_URI = "git://github.com/libharu/libharu.git;branch=master;protocol=https"
12SRCREV = "0c598becaadaef8e3d12b883f9fc2864a118c12d" 12SRCREV = "8fe5a738541a04642885fb7a75b2b5b9c5b416fa"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit cmake
diff --git a/meta-oe/recipes-support/libiio/libiio_0.25.bb b/meta-oe/recipes-support/libiio/libiio_0.26.bb
index 2c6d2b5145..ecd9223600 100644
--- a/meta-oe/recipes-support/libiio/libiio_0.25.bb
+++ b/meta-oe/recipes-support/libiio/libiio_0.26.bb
@@ -4,12 +4,11 @@ SECTION = "libs"
4LICENSE = "LGPL-2.1-or-later" 4LICENSE = "LGPL-2.1-or-later"
5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" 5LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c"
6 6
7SRCREV = "b6028fdeef888ab45f7c1dd6e4ed9480ae4b55e3" 7SRCREV = "a0eca0d2bf10326506fb762f0eec14255b27bef5"
8 8
9SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=main" 9SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https;branch=libiio-v0"
10UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" 10UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
11 11
12S = "${WORKDIR}/git"
13 12
14SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/" 13SETUPTOOLS_SETUP_PATH ?= "${B}/bindings/python/"
15 14
diff --git a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
index ff976ed975..0478ef3403 100644
--- a/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb
+++ b/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb
@@ -9,11 +9,14 @@ HOMEPAGE = "http://www.iodbc.org/"
9 9
10LICENSE = "LGPL-2.0-only | BSD-2-Clause" 10LICENSE = "LGPL-2.0-only | BSD-2-Clause"
11LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ 11LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \
12 file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ 12 file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \
13 " 13 "
14 14
15SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" 15SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz"
16SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" 16SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa"
17
18UPSTREAM_CHECK_URI = "https://github.com/openlink/iODBC/releases"
19UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
17 20
18inherit autotools 21inherit autotools
19 22
@@ -28,3 +31,9 @@ EXTRA_OECONF += " --prefix=/usr/local \
28 31
29inherit multilib_script 32inherit multilib_script
30MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config" 33MULTILIB_SCRIPTS = "${PN}:${bindir}/iodbc-config"
34
35# avoid http://errors.yoctoproject.org/Errors/Details/852861/
36CFLAGS += "-std=gnu17"
37# http://errors.yoctoproject.org/Errors/Details/853276/
38# libiodbc-3.52.16/iodbcinst/unicode.c:1565:16: error: initialization of 'ucs4_t *' {aka 'unsigned int *'} from incompatible pointer type 'wchar_t *' {aka 'long int *'} [-Wincompatible-pointer-types]
39CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
index 38ffd032ab..f4e26a65fc 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-cookie_3.0.5.bb
@@ -7,7 +7,6 @@ SRC_URI = "git://github.com/js-cookie/js-cookie.git;protocol=https;branch=main"
7 7
8SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506" 8SRCREV = "ab3f67fc4fad88cdf07b258c08e4164e06bf7506"
9 9
10S = "${WORKDIR}/git"
11 10
12JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie" 11JQUERYCOOKIEDIR = "${datadir}/javascript/jquery-cookie"
13JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie" 12JQUERYCOOKIEDOCDIR = "${docdir}/libjs-jquery-cookie"
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
index b6147ffeb2..cbf5700a5b 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-globalize_1.7.0.bb
@@ -3,7 +3,6 @@ SECTION = "console/network"
3HOMEPAGE = "https://github.com/globalizejs/globalize" 3HOMEPAGE = "https://github.com/globalizejs/globalize"
4LICENSE = "MIT" 4LICENSE = "MIT"
5 5
6S = "${WORKDIR}/git"
7 6
8LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea" 7LIC_FILES_CHKSUM = "file://LICENSE;md5=4db68fb4d1d9986d736b35039f2ad9ea"
9 8
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
index 63dfc6fa78..88fbc109ee 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery-icheck_1.0.3.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/fronteed/icheck.git;protocol=https;branch=${PV}"
9 9
10SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943" 10SRCREV = "c8c1af84e4b90b4aea31466aad09bf877619e943"
11 11
12S = "${WORKDIR}/git"
13 12
14do_install() { 13do_install() {
15 install -d ${D}${datadir}/javascript/jquery-icheck/ 14 install -d ${D}${datadir}/javascript/jquery-icheck/
diff --git a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
index 4f0d8e5548..be8a29d998 100644
--- a/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
+++ b/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb
@@ -7,11 +7,13 @@ SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~d
7 7
8SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" 8SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b"
9 9
10UPSTREAM_CHECK_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/"
11UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
12
10JQUERYDIR = "${datadir}/javascript/jquery" 13JQUERYDIR = "${datadir}/javascript/jquery"
11JQUERYDOCDIR = "${docdir}/libjs-jquery" 14JQUERYDOCDIR = "${docdir}/libjs-jquery"
12 15
13S = "${WORKDIR}/sources" 16S = "${UNPACKDIR}"
14UNPACKDIR = "${S}"
15 17
16do_install() { 18do_install() {
17 install -d -m 0755 ${D}${JQUERYDIR} 19 install -d -m 0755 ${D}${JQUERYDIR}
diff --git a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
index e639ce59d8..ffd26d263c 100644
--- a/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
+++ b/meta-oe/recipes-support/libjs/libjs-sizzle_1.10.18.bb
@@ -4,10 +4,9 @@ LICENSE = "GPL-2.0-only & MIT & AFL-2.1"
4LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9" 4LIC_FILES_CHKSUM = "file://MIT-LICENSE.txt;md5=e43aa437a6a1ba421653bd5034333bf9"
5 5
6SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz" 6SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/universe/s/sizzle/sizzle_1.10.18.orig.tar.gz"
7SRC_URI[md5sum] = "91477c1edeef9f8100ffd6c4d31725b5"
8SRC_URI[sha256sum] = "8e04ab84bb74b2e338dffc63cd2e52b007f1d8af01b3d25da4d2e07f2b5890f8" 7SRC_URI[sha256sum] = "8e04ab84bb74b2e338dffc63cd2e52b007f1d8af01b3d25da4d2e07f2b5890f8"
9 8
10S = "${WORKDIR}/sizzle-${PV}" 9S = "${UNPACKDIR}/sizzle-${PV}"
11 10
12SIZZLEDIR = "${S}/dist" 11SIZZLEDIR = "${S}/dist"
13 12
diff --git a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
deleted file mode 100644
index d0463a640d..0000000000
--- a/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb
+++ /dev/null
@@ -1,11 +0,0 @@
1DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22"
2HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/"
3SECTION = "libs"
4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3"
6
7SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz"
8SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad"
9SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76"
10
11inherit autotools
diff --git a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
index db05422699..2e59401892 100644
--- a/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb
+++ b/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
8DEPENDS = "libevdev libgudev" 8DEPENDS = "libevdev libgudev"
9 9
10SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" 10SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz"
11SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" 11SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f"
12 12
13inherit meson pkgconfig gobject-introspection ptest vala 13inherit meson pkgconfig gobject-introspection ptest vala
14 14
diff --git a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
index 4d4a5ff109..a2de42d946 100644
--- a/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
+++ b/meta-oe/recipes-support/libmimetic/libmimetic_0.9.8.bb
@@ -16,7 +16,6 @@ SRC_URI += "git://github.com/LadislavSopko/mimetic/;branch=master;protocol=https
16 16
17UPSTREAM_CHECK_COMMITS = "1" 17UPSTREAM_CHECK_COMMITS = "1"
18 18
19S = "${WORKDIR}/git"
20 19
21CXXFLAGS += "-Wno-narrowing -std=c++14" 20CXXFLAGS += "-Wno-narrowing -std=c++14"
22 21
diff --git a/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb b/meta-oe/recipes-support/libmxml/libmxml_4.0.4.bb
index 54582e7047..d692774f08 100644
--- a/meta-oe/recipes-support/libmxml/libmxml_4.0.3.bb
+++ b/meta-oe/recipes-support/libmxml/libmxml_4.0.4.bb
@@ -5,8 +5,7 @@ HOMEPAGE = "https://www.msweet.org/mxml/"
5BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues" 5BUGTRACKER = "https://github.com/michaelrsweet/mxml/issues"
6 6
7SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https" 7SRC_URI = "git://github.com/michaelrsweet/mxml.git;branch=master;protocol=https"
8SRCREV = "804c4f4d922e4ca240ce2cad3ec7bc5d00c08691" 8SRCREV = "0d5afc4278d7a336d554602b951c2979c3f8f296"
9S = "${WORKDIR}/git"
10 9
11# Package does not support out of tree builds. 10# Package does not support out of tree builds.
12inherit autotools-brokensep 11inherit autotools-brokensep
diff --git a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
index 175e10fdf6..4b932029ee 100644
--- a/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
+++ b/meta-oe/recipes-support/libnice/libnice_0.1.22.bb
@@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \
11SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" 11SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz"
12SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" 12SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e"
13 13
14UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags"
15UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
16
14DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" 17DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}"
15 18
16PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" 19PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp"
diff --git a/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
new file mode 100644
index 0000000000..8734d443bb
--- /dev/null
+++ b/meta-oe/recipes-support/libnvme/files/0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch
@@ -0,0 +1,41 @@
1From 14328a9a429fd84ddd1a3ed4fb0eb9643c61fa58 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 7 Apr 2025 13:23:57 +0800
4Subject: [PATCH] mock.c: fix checking of HAVE_GLIBC_IOCTL
5
6Commit [ 0d8d0a55 build: do not include config.h globally ]
7changed to always pass -DHAVE_GLIBC_IOCTL=[0|1], and this causes
8a regression, for system without glibc ioctl, -DHAVE_GLIBC_IOCTL=0
9is passed, and causes error:
10../git/test/ioctl/mock.c:123:5: error: conflicting types for 'ioctl'; have 'int(int, long unsigned int, ...)'
11 123 | int ioctl(int fd, unsigned long request, ...)
12 | ^~~~~
13In file included from ../git/test/ioctl/mock.c:9:
14pathto/usr/include/sys/ioctl.h:115:5: note: previous declaration of 'ioctl' with type 'int(int, int, ...)'
15 115 | int ioctl (int, int, ...);
16
17Fixed by checking value of HAVE_GLIBC_IOCTL in mock.c
18
19Upstream-Status: Submitted [https://github.com/linux-nvme/libnvme/pull/985]
20
21Signed-off-by: Changqing Li <changqing.li@windriver.com>
22---
23 test/ioctl/mock.c | 2 +-
24 1 file changed, 1 insertion(+), 1 deletion(-)
25
26diff --git a/test/ioctl/mock.c b/test/ioctl/mock.c
27index 7402b45c..da3caba8 100644
28--- a/test/ioctl/mock.c
29+++ b/test/ioctl/mock.c
30@@ -118,7 +118,7 @@ void end_mock_cmds(void)
31 } \
32 })
33
34-#ifdef HAVE_GLIBC_IOCTL
35+#if defined(HAVE_GLIBC_IOCTL) && HAVE_GLIBC_IOCTL == 1
36 typedef int (*ioctl_func_t)(int, unsigned long, void *);
37 int ioctl(int fd, unsigned long request, ...)
38 #else
39--
402.34.1
41
diff --git a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb b/meta-oe/recipes-support/libnvme/libnvme_1.12.bb
index 1e03b4e7ad..95d18a1ed0 100644
--- a/meta-oe/recipes-support/libnvme/libnvme_1.9.bb
+++ b/meta-oe/recipes-support/libnvme/libnvme_1.12.bb
@@ -11,12 +11,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
11 file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ 11 file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \
12 file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" 12 file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2"
13DEPENDS = "json-c" 13DEPENDS = "json-c"
14SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" 14SRCREV = "5ec1f5284ecb0eda481f3d2d61236fbc5b46164f"
15 15
16SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" 16SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master \
17 file://0001-mock.c-fix-checking-of-HAVE_GLIBC_IOCTL.patch"
17 18
18S = "${WORKDIR}/git"
19 19
20inherit meson pkgconfig 20inherit meson pkgconfig
21 21
22EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" 22PACKAGECONFIG ??= "keyutils openssl"
23
24PACKAGECONFIG[keyutils] = "-Dkeyutils=enabled,-Dkeyutils=disabled,keyutils"
25PACKAGECONFIG[openssl] = "-Dopenssl=enabled,-Dopenssl=disabled,openssl"
26PACKAGECONFIG[python] = "-Dpython=enabled,-Dpython=disabled,python"
diff --git a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
index d4b8170873..3e3f9137cf 100644
--- a/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
+++ b/meta-oe/recipes-support/liboauth/liboauth_1.0.3.bb
@@ -12,7 +12,6 @@ DEPENDS = "curl openssl"
12SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz \ 12SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BP}.tar.gz \
13 file://0001-Support-OpenSSL-1.1.0.patch \ 13 file://0001-Support-OpenSSL-1.1.0.patch \
14 " 14 "
15SRC_URI[md5sum] = "689b46c2b3ab1a39735ac33f714c4f7f"
16SRC_URI[sha256sum] = "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f" 15SRC_URI[sha256sum] = "0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f"
17 16
18inherit autotools pkgconfig 17inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch b/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch
new file mode 100644
index 0000000000..24249b9360
--- /dev/null
+++ b/meta-oe/recipes-support/liboop/liboop/0001-Use-pkg-config-to-find-tcl.patch
@@ -0,0 +1,48 @@
1From 5dad843ca0860d6d7be443ddc850566584b8004a Mon Sep 17 00:00:00 2001
2From: Gyorgy Sarvari <skandigraun@gmail.com>
3Date: Sun, 16 Feb 2025 21:09:02 +0100
4Subject: [PATCH] Use pkg-config to find tcl
5
6Instead of using hardcoded path for the tcl include folder
7use pkg-config to find the proper values.
8
9That way it won't use the system folders for cross-compilation.
10
11Also, extend the number of tcl versions to check (at the time of
12this commit oe-core provides version 8.6)
13
14Upstream-Status: Pending
15---
16 configure.ac | 15 +++++++--------
17 1 file changed, 7 insertions(+), 8 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index e95956e..3d0dc82 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -71,18 +71,17 @@ if test xno != x$with_glib; then
24 fi
25
26 if test xno != x$with_tcl; then
27- for version in 8.4 8.3 8.2 8.1 8.0 ; do
28- CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
29- AC_CHECK_LIB(tcl$version,Tcl_Main,[
30- AC_CHECK_HEADER(tcl.h,[
31+ save_cppflags="$CPPFLAGS"
32+ for version in "" 8.4 8.3 8.2 8.1 8.0 ; do
33+ PKG_CHECK_EXISTS(tcl$version,,continue)
34+ PKG_CHECK_MODULES(TCL, tcl$version, [
35 LIBOOP_LIBS="liboop-tcl.la $LIBOOP_LIBS"
36 AC_DEFINE(HAVE_TCL)
37- TCL_INCLUDES="-I/usr/include/tcl$version"
38- TCL_LIBS="-ltcl$version"
39+ TCL_INCLUDES="$TCL_CFLAGS"
40+ CPPFLAGS="$save_cppflags $TCL_CFLAGS"
41 break
42- ])])
43+ ])
44 done
45- CPPFLAGS="$save_cppflags"
46 fi
47
48 if test xyes = x$with_libwww; then
diff --git a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch b/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
deleted file mode 100644
index 0521aaeaff..0000000000
--- a/meta-oe/recipes-support/liboop/liboop/tcl_dev.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Upstream-Status: Pending
2
3--- a/configure.ac
4+++ b/configure.ac
5@@ -71,7 +71,7 @@
6 fi
7
8 if test xno != x$with_tcl; then
9- for version in 8.4 8.3 8.2 8.1 8.0 ; do
10+ for version in "" 8.4 8.3 8.2 8.1 8.0 ; do
11 CPPFLAGS="$save_cppflags -I/usr/include/tcl$version"
12 AC_CHECK_LIB(tcl$version,Tcl_Main,[
13 AC_CHECK_HEADER(tcl.h,[
diff --git a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
index 7ad88b7402..19da1d1aa9 100644
--- a/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
+++ b/meta-oe/recipes-support/liboop/liboop_1.0.1.bb
@@ -1,19 +1,18 @@
1DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems" 1DESCRIPTION = "Liboop is a low-level event loop management library for POSIX-based operating systems"
2HOMEPAGE = "http://www.lysator.liu.se/liboop/" 2HOMEPAGE = "http://www.lysator.liu.se/liboop/"
3LICENSE = "GPL-2.0-only" 3LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700" 4LIC_FILES_CHKSUM = "file://COPYING;md5=8b54f38ccbd44feb80ab90e01af8b700"
5 5
6SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \ 6SRC_URI = "http://ftp.lysator.liu.se/pub/liboop/liboop-${PV}.tar.gz \
7 file://tcl_dev.patch \ 7 file://0001-Use-pkg-config-to-find-tcl.patch \
8" 8"
9 9
10SRC_URI[md5sum] = "f2b3dff17355fd9a6e2229caca8993f0"
11SRC_URI[sha256sum] = "56af16ad65e7397dadc8268e37ff6f67431db390c60c75e21a33e12b0e0d17e0" 10SRC_URI[sha256sum] = "56af16ad65e7397dadc8268e37ff6f67431db390c60c75e21a33e12b0e0d17e0"
12 11
13PACKAGECONFIG ?= "" 12PACKAGECONFIG ?= ""
14PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" 13PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline"
15PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0 libpcre" 14PACKAGECONFIG[glib] = "--with-glib,--without-glib,glib-2.0 libpcre"
16PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl" 15PACKAGECONFIG[tcl] = "--with-tcl,--without-tcl,tcl8"
17 16
18EXTRA_OECONF += "--without-adns -without-libwww" 17EXTRA_OECONF += "--without-adns -without-libwww"
19 18
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
deleted file mode 100644
index 467c6b4baf..0000000000
--- a/meta-oe/recipes-support/libosinfo/libosinfo/0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1From 5bbdd06503456784c5ffa22409e8bab50470d673 Mon Sep 17 00:00:00 2001
2From: Michal Privoznik <mprivozn@redhat.com>
3Date: Mon, 27 Nov 2023 15:11:45 +0100
4Subject: [PATCH] osinfo: Make xmlError struct constant in
5 propagate_libxml_error()
6
7In libxml2 commit v2.12.0~14 the API changed so that
8xmlGetLastError() returns pointer to a constant xmlError struct.
9Reflect this change in our code.
10
11Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/merge_requests/155]
12Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
13---
14 osinfo/osinfo_install_script.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/osinfo/osinfo_install_script.c b/osinfo/osinfo_install_script.c
18index 5800f37..303245a 100644
19--- a/osinfo/osinfo_install_script.c
20+++ b/osinfo/osinfo_install_script.c
21@@ -769,7 +769,7 @@ static void propagate_libxml_error(GError **error, const char *format, ...) G_GN
22
23 static void propagate_libxml_error(GError **error, const char *format, ...)
24 {
25- xmlErrorPtr err = xmlGetLastError();
26+ const xmlError *err = xmlGetLastError();
27 char *prefix;
28 va_list ap;
29
30--
312.44.0
32
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch b/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch
new file mode 100644
index 0000000000..f76aef8b25
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/libosinfo/0adf38535637ec668e658d43f04f60f11f51574f.patch
@@ -0,0 +1,86 @@
1From 0adf38535637ec668e658d43f04f60f11f51574f Mon Sep 17 00:00:00 2001
2From: Roman Bogorodskiy <bogorodskiy@gmail.com>
3Date: Thu, 10 Apr 2025 13:54:02 +0200
4Subject: [PATCH] loader: don't use libxml2 deprecated APIs
5
6Address the following items:
7
8 - Deprecated direct access to buf's content
9 - Mismatching error function signature
10 - Deprecated direct access to ctxt's lastError
11
12Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
13Signed-off-by: Markus Volk <f_l_k@t-online.de>
14
15Upstream-Status: Backport [https://gitlab.com/libosinfo/libosinfo/-/commit/0adf38535637ec668e658d43f04f60f11f51574f.patch]
16---
17 osinfo/osinfo_loader.c | 42 +++++++++++++++++++++++-------------------
18 1 file changed, 23 insertions(+), 19 deletions(-)
19
20diff --git a/osinfo/osinfo_loader.c b/osinfo/osinfo_loader.c
21index 0a9004af..b3fd4535 100644
22--- a/osinfo/osinfo_loader.c
23+++ b/osinfo/osinfo_loader.c
24@@ -354,7 +354,7 @@ osinfo_loader_doc(const char *xpath,
25 xmlXPathFreeObject(obj);
26 OSINFO_LOADER_SET_ERROR(err, "Cannot format stylesheet");
27 }
28- ret = g_strdup((char *)buf->content);
29+ ret = g_strdup((char *)xmlBufferContent(buf));
30
31 xmlBufferFree(buf);
32 xmlXPathFreeObject(obj);
33@@ -1902,28 +1902,32 @@ static void osinfo_loader_root(OsinfoLoader *loader,
34 }
35
36 static void
37-catchXMLError(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...)
38+catchXMLError(void *ctx, const char *msg, ...)
39 {
40 xmlParserCtxtPtr ctxt = (xmlParserCtxtPtr) ctx;
41+ const xmlError *xmlErr = NULL;
42+ g_autofree gchar *xmlmsg = NULL;
43
44- if (ctxt && ctxt->_private) {
45- GError **err = ctxt->_private;
46- if (!error_is_set(err)) {
47- gchar *xmlmsg;
48- if (ctxt->lastError.file) {
49- xmlmsg = g_strdup_printf("%s:%d: %s",
50- ctxt->lastError.file,
51- ctxt->lastError.line,
52- ctxt->lastError.message);
53- } else {
54- xmlmsg = g_strdup_printf("at line %d: %s",
55- ctxt->lastError.line,
56- ctxt->lastError.message);
57- }
58- OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg);
59- g_free(xmlmsg);
60- }
61+ if (!ctxt || !ctxt->_private)
62+ return;
63+
64+ if (error_is_set(ctxt->_private))
65+ return;
66+
67+ if (!(xmlErr = xmlCtxtGetLastError(ctx)))
68+ return;
69+
70+ if (xmlErr->file) {
71+ xmlmsg = g_strdup_printf("%s:%d: %s",
72+ xmlErr->file,
73+ xmlErr->line,
74+ xmlErr->message);
75+ } else {
76+ xmlmsg = g_strdup_printf("at line %d: %s",
77+ xmlErr->line,
78+ xmlErr->message);
79 }
80+ OSINFO_LOADER_SET_ERROR(ctxt->_private, xmlmsg);
81 }
82
83 static void osinfo_loader_process_xml(OsinfoLoader *loader,
84--
85GitLab
86
diff --git a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-oe/recipes-support/libosinfo/libosinfo_1.12.0.bb
index 8ef7ac3df0..2462786aae 100644
--- a/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb
+++ b/meta-oe/recipes-support/libosinfo/libosinfo_1.12.0.bb
@@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
8SRC_URI = " \ 8SRC_URI = " \
9 git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \ 9 git://gitlab.com/libosinfo/libosinfo.git;branch=main;protocol=https \
10 file://0001-meson.build-allow-crosscompiling-gir.patch \ 10 file://0001-meson.build-allow-crosscompiling-gir.patch \
11 file://0001-osinfo-Make-xmlError-struct-constant-in-propagate_li.patch \ 11 file://0adf38535637ec668e658d43f04f60f11f51574f.patch \
12" 12"
13 13
14SRCREV = "ca9dd5b810dc04ea38048ae9be491654c8596ef9" 14SRCREV = "b505ef5161d2552102a743acd4ad83298d3d8f99"
15 15
16S = "${WORKDIR}/git"
17 16
18inherit meson pkgconfig gtk-doc gobject-introspection vala 17inherit meson pkgconfig gtk-doc gobject-introspection vala
19 18
@@ -32,4 +31,4 @@ EXTRA_OEMESON += " \
32 -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ 31 -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \
33" 32"
34 33
35RDEPENDS:${PN} = "hwdata" 34RDEPENDS:${PN} = "hwdata osinfo-db"
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
new file mode 100644
index 0000000000..ee75c39eee
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.12.0.bb
@@ -0,0 +1,20 @@
1SUMMARY = "Tools for managing the libosinfo database files"
2HOMEPAGE = "https://libosinfo.org"
3
4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6
7DEPENDS = "glib-2.0 json-glib libarchive libsoup"
8
9SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \
10 "
11SRCREV = "e5564be303bfac49cc3490bd0fada342cd65566f"
12
13
14inherit meson pkgconfig
15
16do_configure:prepend () {
17 sed -i 's/-Werror//' ${S}/meson.build
18}
19
20BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb b/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb
new file mode 100644
index 0000000000..33e17234ce
--- /dev/null
+++ b/meta-oe/recipes-support/libosinfo/osinfo-db_20250606.bb
@@ -0,0 +1,20 @@
1SUMMARY = "osinfo-db provides the database files for use with the libosinfo library"
2HOMEPAGE = "https://libosinfo.org"
3
4LICENSE = "GPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6
7DEPENDS = "osinfo-db-tools-native"
8
9SRC_URI = "git://gitlab.com/libosinfo/osinfo-db.git;branch=main;protocol=https"
10
11SRCREV = "62f8adceb8ee88e643a134f2cfaf04fc11b9fc51"
12
13
14inherit allarch autotools-brokensep
15
16EXTRA_OEMAKE = "OSINFO_DB_TARGET='--dir ${datadir}/osinfo'"
17
18do_configure[noexec] = "1"
19
20FILES:${PN} = "${datadir}/osinfo"
diff --git a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
index 2237782009..807d079a05 100644
--- a/meta-oe/recipes-support/libp11/libp11_0.4.12.bb
+++ b/meta-oe/recipes-support/libp11/libp11_0.4.13.bb
@@ -10,15 +10,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fad9b3332be894bab9bc501572864b29"
10DEPENDS = "libtool openssl" 10DEPENDS = "libtool openssl"
11 11
12SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https" 12SRC_URI = "git://github.com/OpenSC/libp11.git;branch=master;protocol=https"
13SRCREV = "53d65dc48cf436694f7edcfc805414e608e8a2bf" 13
14SRCREV = "6d669183c7b241ce47ecce28744837ad92814f5c"
14 15
15UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "libp11-(?P<pver>\d+(\.\d+)+)"
16 17
17S = "${WORKDIR}/git"
18 18
19inherit autotools pkgconfig 19inherit autotools pkgconfig
20 20
21EXTRA_OECONF = "--disable-static" 21EXTRA_OECONF = "--disable-static"
22EXTRA_OECONF:append:class-native = " --with-enginesdir=${RECIPE_SYSROOT_NATIVE}/usr/lib/engines-3"
22 23
23do_install:append () { 24do_install:append () {
24 rm -rf ${D}${docdir}/${BPN} 25 rm -rf ${D}${docdir}/${BPN}
diff --git a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-oe/recipes-support/libpaper/libpaper_2.2.6.bb
index a45ffe1849..4acf7fd473 100644
--- a/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb
+++ b/meta-oe/recipes-support/libpaper/libpaper_2.2.6.bb
@@ -2,7 +2,10 @@ LICENSE = "LGPL-2.1-only"
2LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 2LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
3 3
4SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" 4SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz"
5SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" 5SRC_URI[sha256sum] = "500d39dc58768ee09688738c8b5bfe07640ba2fd6c25a6dc78810eb69c719e93"
6
7UPSTREAM_CHECK_URI = "https://github.com/rrthomas/libpaper/releases"
8UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
6 9
7inherit perlnative autotools 10inherit perlnative autotools
8 11
diff --git a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
index 4d089f3b79..01425c6db0 100644
--- a/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
+++ b/meta-oe/recipes-support/libraw/libraw_0.21.2.bb
@@ -4,8 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=1501ae0aa3c8544e63f08d6f7bf88a6f"
4 4
5SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https" 5SRC_URI = "git://github.com/LibRaw/LibRaw.git;branch=0.21-stable;protocol=https"
6SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d" 6SRCREV = "1ef70158d7fde1ced6aaddb0b9443c32a7121d3d"
7S = "${WORKDIR}/git"
8 7
9inherit autotools pkgconfig 8inherit autotools pkgconfig
10 9
11DEPENDS = "jpeg jasper lcms" 10DEPENDS = "jpeg jasper lcms"
11
12CVE_STATUS[CVE-2020-22628] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2"
13CVE_STATUS[CVE-2023-1729] = "cpe-incorrect: The current version (0.21.2) is not affected by the CVE which affects versions earlier than 0.21.2"
diff --git a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
index 15e1ee2438..97eb105d46 100644
--- a/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
+++ b/meta-oe/recipes-support/libraw1394/libraw1394_2.1.2.bb
@@ -5,7 +5,6 @@ LICENSE = "LGPL-2.1-only"
5LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499" 5LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=d8045f3b8f929c1cb29a1e3fd737b499"
6 6
7SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz" 7SRC_URI = "https://www.kernel.org/pub/linux/libs/ieee1394/${BPN}-${PV}.tar.gz"
8SRC_URI[md5sum] = "45031ab15ca93e50c19886a38bc1814a"
9SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c" 8SRC_URI[sha256sum] = "ddc4e32721cdfe680d964aaede68ac606a20cd17dd2ba70e2d7e0692086ab57c"
10 9
11inherit autotools 10inherit autotools
diff --git a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
index 6148e7cb08..968094daff 100644
--- a/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
+++ b/meta-oe/recipes-support/librdkafka/librdkafka_1.8.2.bb
@@ -16,7 +16,6 @@ DEPENDS = "zlib openssl zstd"
16 16
17inherit cmake 17inherit cmake
18 18
19S = "${WORKDIR}/git"
20 19
21FILES:${PN} += "${datadir}" 20FILES:${PN} += "${datadir}"
22 21
diff --git a/meta-oe/recipes-support/librsync/librsync_2.3.4.bb b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
index 3cad665389..c8dfafa2aa 100644
--- a/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
+++ b/meta-oe/recipes-support/librsync/librsync_2.3.4.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499"
5 5
6SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https" 6SRC_URI = "git://github.com/librsync/librsync.git;branch=master;protocol=https"
7SRCREV = "e364852674780e43d578e4239128ff7014190ed3" 7SRCREV = "e364852674780e43d578e4239128ff7014190ed3"
8S = "${WORKDIR}/git"
9 8
10DEPENDS = "popt" 9DEPENDS = "popt"
11 10
diff --git a/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb b/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb
new file mode 100644
index 0000000000..245d501b8a
--- /dev/null
+++ b/meta-oe/recipes-support/libserialmodule/libserialmodule_1.0.8.bb
@@ -0,0 +1,12 @@
1SUMMARY = "A library for Serial/COM"
2DESCRIPTION = "Async C/C++ I/O with COM/Serial Port Library."
3HOMEPAGE = "https://github.com/thuanalg/libserialmodule"
4
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22cdd382a6275cb4c2e75c517952ac7c"
7DEPENDS = "libsimplelog"
8SRC_URI = "git://git@github.com/thuanalg/libserialmodule.git;branch=main;protocol=https;tag=v${PV}"
9SRCREV = "f89f98ff0c9d0aaee2624d40addb0687a74c5d81"
10inherit cmake
11EXTRA_OECMAKE = "-DUNIX_LINUX=1 -DMETA_OPENEMBEDDED=1"
12
diff --git a/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb
new file mode 100644
index 0000000000..31dce12155
--- /dev/null
+++ b/meta-oe/recipes-support/libsimplelog/libsimplelog_1.0.8.bb
@@ -0,0 +1,18 @@
1
2SUMMARY = "simplelog-topc - Simple, STABLE, powerful of logging library in ANSI C/C++. Ready for billion records."
3DESCRIPTION = "Async and Fast C/C++ multi-thread logger with topics. No external dependencies."
4HOMEPAGE = "https://github.com/thuanalg/simplelog-topic"
5LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=22cdd382a6275cb4c2e75c517952ac7c"
7
8SRC_URI = "git://github.com/thuanalg/simplelog-topic.git;branch=main;protocol=https;tag=v${PV}"
9
10SRCREV = "093d80b4006042b75a433a5e63760ae9bebad142"
11
12
13inherit cmake
14
15# Specify any options you want to pass to cmake using EXTRA_OECMAKE:
16EXTRA_OECMAKE += "-DUNIX_LINUX=1"
17
18
diff --git a/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch b/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch
new file mode 100644
index 0000000000..69af5f5141
--- /dev/null
+++ b/meta-oe/recipes-support/libsmi/libsmi/0001-Fix-build-failure-with-gcc-15.patch
@@ -0,0 +1,154 @@
1From ea4bc4aad22455f8f37030f5915c4a94d76fd5e7 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Mon, 7 Apr 2025 18:57:26 +0900
4Subject: [PATCH] Fix build failure with gcc-15
5
6* see more details: http://errors.yoctoproject.org/Errors/Details/851179/
7
8yang-data.c:594:9: error: too many arguments to function 'yangparse'; expected 0, have 1
9 594 | yangparse(parser);
10 | ^~~~~~~~~ ~~~~~~
11In file included from scanner-yang.h:19,
12 from yang-data.c:47:
13parser-yang.h:16:12: note: declared here
14 16 | extern int yangparse();
15 | ^~~~~~~~~
16In file included from parser-yang.c:346:
17parser-yang.tab.h:170:5: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
18 170 | int yangparse (struct Parser *parserPtr);
19 | ^~~~~~~~~
20In file included from parser-yang.y:40:
21parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
22 16 | extern int yangparse();
23 | ^~~~~~~~~
24make[2]: *** [Makefile:573: yang-data.lo] Error 1
25make[2]: *** Waiting for unfinished jobs....
26smi-data.c: In function 'loadModule':
27smi-data.c:4658:9: error: too many arguments to function 'smiparse'; expected 0, have 1
28 4658 | smiparse((void *)&parser);
29 | ^~~~~~~~ ~~~~~~~~~~~~~~~
30smi-data.c:42:12: note: declared here
31 42 | extern int smiparse();
32 | ^~~~~~~~
33parser-smi.c:1515:5: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
34 1515 | int smiparse (struct Parser *parserPtr);
35 | ^~~~~~~~
36In file included from parser-smi.y:37:
37parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
38 27 | extern int smiparse();
39 | ^~~~~~~~
40parser-smi.c:63:25: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
41 63 | #define yyparse smiparse
42 | ^~~~~~~~
43parser-smi.c:3207:1: note: in expansion of macro 'yyparse'
44 3207 | yyparse (struct Parser *parserPtr)
45 | ^~~~~~~
46parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
47 27 | extern int smiparse();
48 | ^~~~~~~~
49parser-yang.c:68:25: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
50 68 | #define yyparse yangparse
51 | ^~~~~~~~~
52parser-yang.c:2312:1: note: in expansion of macro 'yyparse'
53 2312 | yyparse (struct Parser *parserPtr)
54 | ^~~~~~~
55parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
56 16 | extern int yangparse();
57 | ^~~~~~~~~
58In file included from scanner-yang.l:31:
59parser-yang.tab.h:170:5: error: conflicting types for 'yangparse'; have 'int(struct Parser *)'
60 170 | int yangparse (struct Parser *parserPtr);
61 | ^~~~~~~~~
62In file included from scanner-yang.l:30:
63parser-yang.h:16:12: note: previous declaration of 'yangparse' with type 'int(void)'
64 16 | extern int yangparse();
65 | ^~~~~~~~~
66scanner-yang.l: In function 'yangEnterLexRecursion':
67scanner-yang.l:79:1: warning: old-style function definition [-Wold-style-definition]
68 79 |
69 | ^
70make[2]: *** [Makefile:573: smi-data.lo] Error 1
71In file included from parser-smi.y:36:
72parser-smi.c: In function 'smiparse':
73parser-smi.c:10265:29: warning: passing argument 1 of 'smiyyerror' discards 'const' qualifier from pointer target type [-Wdiscarded-qualifiers]
7410265 | yyerror (parserPtr, yymsgp);
75 | ^~~~~~
76error.h:25:44: note: in definition of macro 'yyerror'
77 25 | #define yyerror(parserPtr, msg) smiyyerror(msg, parserPtr)
78 | ^~~
79In file included from parser-smi.y:40:
80smi-check.h:71:30: note: expected 'char *' but argument is of type 'const char *'
81 71 | extern void smiyyerror(char *msg, Parser *parserPtr);
82 | ~~~~~~^~~
83make[2]: *** [Makefile:573: parser-yang.lo] Error 1
84make[2]: *** [Makefile:573: parser-smi.lo] Error 1
85make[2]: *** [Makefile:573: scanner-yang.lo] Error 1
86In file included from scanner-smi.l:34:
87parser-smi.tab.h:192:5: error: conflicting types for 'smiparse'; have 'int(struct Parser *)'
88 192 | int smiparse (struct Parser *parserPtr);
89 | ^~~~~~~~
90In file included from util.h:22,
91 from scanner-smi.l:32:
92parser-smi.h:27:12: note: previous declaration of 'smiparse' with type 'int(void)'
93 27 | extern int smiparse();
94 | ^~~~~~~~
95scanner-smi.l: In function 'smiEnterLexRecursion':
96scanner-smi.l:76:1: warning: old-style function definition [-Wold-style-definition]
97 76 | smiEnterLexRecursion(file)
98 | ^~~~~~~~~~~~~~~~~~~~
99
100Upstream-Status: Submitted [https://lists.ibr.cs.tu-bs.de/hyperkitty/list/libsmi@ibr.cs.tu-bs.de/thread/XUW4E575ALYHCAM33OEMU5V2LKUOYAVA/]
101Signed-off-by: mark.yang <mark.yang@lge.com>
102---
103 lib/parser-smi.h | 2 +-
104 lib/parser-yang.h | 4 ++--
105 lib/smi-data.c | 2 +-
106 3 files changed, 4 insertions(+), 4 deletions(-)
107
108diff --git a/lib/parser-smi.h b/lib/parser-smi.h
109index 90d7ec2..c2a3d1f 100644
110--- a/lib/parser-smi.h
111+++ b/lib/parser-smi.h
112@@ -24,7 +24,7 @@
113
114
115
116-extern int smiparse();
117+extern int smiparse(struct Parser *parserPtr);
118
119
120
121diff --git a/lib/parser-yang.h b/lib/parser-yang.h
122index dbfec46..f008cd6 100644
123--- a/lib/parser-yang.h
124+++ b/lib/parser-yang.h
125@@ -6,14 +6,14 @@
126 #include <stdio.h>
127
128 #include "yang-data.h"
129-
130+#include "smi-data.h"
131
132
133 #define YYERROR_VERBOSE
134
135
136
137-extern int yangparse();
138+extern int yangparse(struct Parser *parserPtr);
139
140
141
142diff --git a/lib/smi-data.c b/lib/smi-data.c
143index c9d95a4..773bc01 100644
144--- a/lib/smi-data.c
145+++ b/lib/smi-data.c
146@@ -39,7 +39,7 @@
147
148 #ifdef BACKEND_SMI
149 #include "scanner-smi.h"
150-extern int smiparse();
151+extern int smiparse(struct Parser *parserPtr);
152 #endif
153
154 #ifdef BACKEND_SMING
diff --git a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
index 1f7442af07..85eac33369 100644
--- a/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
+++ b/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb
@@ -9,11 +9,14 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \
9 file://libsmi-fix-the-test-dump-files.patch \ 9 file://libsmi-fix-the-test-dump-files.patch \
10 file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \ 10 file://0001-Define-createIdentifierRef-prototype-in-yang-complex.patch \
11 file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \ 11 file://0001-parser-yang-Define-_DEFAULT_SOURCE.patch \
12 file://0001-Fix-build-failure-with-gcc-15.patch \
12 " 13 "
13 14
14SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11"
15SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" 15SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3"
16 16
17UPSTREAM_CHECK_URI = "https://repology.org/project/libsmi/information"
18UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
19
17DEPENDS += "bison-native flex-native wget-native gawk-native" 20DEPENDS += "bison-native flex-native wget-native gawk-native"
18 21
19inherit autotools-brokensep update-alternatives 22inherit autotools-brokensep update-alternatives
diff --git a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
index 5969220a41..958f3cf5a1 100644
--- a/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
+++ b/meta-oe/recipes-support/libsoc/libsoc_0.8.2.bb
@@ -12,7 +12,6 @@ inherit autotools pkgconfig python3-dir
12SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb" 12SRCREV = "fd1ad6e7823fa76d8db0d3c5884faffa8ffddafb"
13SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https" 13SRC_URI = "git://github.com/jackmitch/libsoc.git;branch=master;protocol=https"
14 14
15S = "${WORKDIR}/git"
16 15
17BOARD ??= "devboard" 16BOARD ??= "devboard"
18 17
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch
new file mode 100644
index 0000000000..d75594bb4f
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-CVE-2025-32911.patch
@@ -0,0 +1,74 @@
1From 52c5859b82fe79f2c32d883e048d218e0d7f2182 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Wed, 30 Apr 2025 14:59:55 +0800
4Subject: [PATCH] CVE-2025-32911
5
6CVE: CVE-2025-32911 CVE-2025-32913
7Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/422/commits]
8
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11 libsoup/soup-message-headers.c | 13 +++++++++----
12 tests/header-parsing-test.c | 15 +++++++++++++++
13 2 files changed, 24 insertions(+), 4 deletions(-)
14
15diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
16index 39ad14a..78b2455 100644
17--- a/libsoup/soup-message-headers.c
18+++ b/libsoup/soup-message-headers.c
19@@ -1454,10 +1454,15 @@ soup_message_headers_get_content_disposition (SoupMessageHeaders *hdrs,
20 */
21 if (params && g_hash_table_lookup_extended (*params, "filename",
22 &orig_key, &orig_value)) {
23- char *filename = strrchr (orig_value, '/');
24-
25- if (filename)
26- g_hash_table_insert (*params, g_strdup (orig_key), filename + 1);
27+ if (orig_value) {
28+ char *filename = strrchr (orig_value, '/');
29+
30+ if (filename)
31+ g_hash_table_insert (*params, g_strdup (orig_key), g_strdup(filename + 1));
32+ } else {
33+ /* filename with no value isn't valid. */
34+ g_hash_table_remove (*params, "filename");
35+ }
36 }
37 return TRUE;
38 }
39diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
40index 946f118..752196e 100644
41--- a/tests/header-parsing-test.c
42+++ b/tests/header-parsing-test.c
43@@ -1034,6 +1034,7 @@ do_param_list_tests (void)
44 #define RFC5987_TEST_HEADER_FALLBACK "attachment; filename*=Unknown''t%FF%FF%FFst.txt; filename=\"test.txt\""
45 #define RFC5987_TEST_HEADER_NO_TYPE "filename=\"test.txt\""
46 #define RFC5987_TEST_HEADER_NO_TYPE_2 "filename=\"test.txt\"; foo=bar"
47+#define RFC5987_TEST_HEADER_EMPTY_FILENAME ";filename"
48
49 static void
50 do_content_disposition_tests (void)
51@@ -1133,6 +1134,20 @@ do_content_disposition_tests (void)
52 g_assert_cmpstr (filename, ==, RFC5987_TEST_FALLBACK_FILENAME);
53 parameter2 = g_hash_table_lookup (params, "foo");
54 g_assert_cmpstr (parameter2, ==, "bar");
55+ g_hash_table_destroy (params);
56+
57+ /* Empty filename */
58+ soup_message_headers_clear (hdrs);
59+ soup_message_headers_append (hdrs, "Content-Disposition",
60+ RFC5987_TEST_HEADER_EMPTY_FILENAME);
61+ if (!soup_message_headers_get_content_disposition (hdrs,
62+ &disposition,
63+ &params)) {
64+ soup_test_assert (FALSE, "empty filename decoding FAILED");
65+ return;
66+ }
67+ g_free (disposition);
68+ g_assert_false (g_hash_table_contains (params, "filename"));
69 g_hash_table_destroy (params);
70
71 soup_message_headers_free (hdrs);
72--
732.34.1
74
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
new file mode 100644
index 0000000000..d867e5bc17
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch
@@ -0,0 +1,44 @@
1From ced3c5d8cad0177b297666343f1561799dfefb0d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 22 Nov 2023 18:49:10 -0800
4Subject: [PATCH] Fix build with libxml2-2.12.0 and clang-17
5
6Fixes build errors about missing function prototypes with clang-17
7
8Fixes
9| ../libsoup-2.74.3/libsoup/soup-xmlrpc-old.c:512:8: error: call to undeclared function 'xmlParseMemory'; ISO C99 and later do not support implicit function declarations
10
11Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/385]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 libsoup/soup-xmlrpc-old.c | 1 +
15 libsoup/soup-xmlrpc.c | 1 +
16 2 files changed, 2 insertions(+)
17
18diff --git a/libsoup/soup-xmlrpc-old.c b/libsoup/soup-xmlrpc-old.c
19index c57086b6..527e3b23 100644
20--- a/libsoup/soup-xmlrpc-old.c
21+++ b/libsoup/soup-xmlrpc-old.c
22@@ -11,6 +11,7 @@
23
24 #include <string.h>
25
26+#include <libxml/parser.h>
27 #include <libxml/tree.h>
28
29 #include "soup-xmlrpc-old.h"
30diff --git a/libsoup/soup-xmlrpc.c b/libsoup/soup-xmlrpc.c
31index 42dcda9c..e991cbf0 100644
32--- a/libsoup/soup-xmlrpc.c
33+++ b/libsoup/soup-xmlrpc.c
34@@ -17,6 +17,7 @@
35
36 #include <string.h>
37 #include <errno.h>
38+#include <libxml/parser.h>
39 #include <libxml/tree.h>
40 #include "soup-xmlrpc.h"
41 #include "soup.h"
42--
432.43.0
44
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch
new file mode 100644
index 0000000000..fcd442c13a
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Fix-possibly-uninitialized-warnings.patch
@@ -0,0 +1,43 @@
1From 1159686379184a1c899eabb2174258aba5e0fd79 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Mon, 20 Sep 2021 15:41:31 -0500
4Subject: [PATCH] Fix possibly uninitialized warnings
5
6Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/fb98e9a8c3062c75357b961543af091de2dd5459]
7
8Signed-off-by: Changqing Li <changqing.li@windriver.com>
9---
10 libsoup/soup-websocket-connection.c | 2 +-
11 tests/samesite-test.c | 3 +++
12 2 files changed, 4 insertions(+), 1 deletion(-)
13
14diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
15index 65c1492..585d45c 100644
16--- a/libsoup/soup-websocket-connection.c
17+++ b/libsoup/soup-websocket-connection.c
18@@ -471,7 +471,7 @@ send_message (SoupWebsocketConnection *self,
19 GByteArray *bytes;
20 gsize frame_len;
21 guint8 *outer;
22- guint8 mask_offset;
23+ guint8 mask_offset = 0;
24 GBytes *filtered_bytes;
25 GList *l;
26 GError *error = NULL;
27diff --git a/tests/samesite-test.c b/tests/samesite-test.c
28index 0b081b2..60c9b8e 100644
29--- a/tests/samesite-test.c
30+++ b/tests/samesite-test.c
31@@ -60,6 +60,9 @@ assert_highest_policy_visible (GSList *cookies, SoupSameSitePolicy policy)
32 case SOUP_SAME_SITE_POLICY_NONE:
33 expected_count = 1;
34 break;
35+ default:
36+ g_assert_not_reached ();
37+ break;
38 }
39
40 g_assert_cmpuint (size, ==, expected_count);
41--
422.34.1
43
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch
new file mode 100644
index 0000000000..0d4139ec08
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/0001-Remove-http-and-https-aliases-support-test.patch
@@ -0,0 +1,145 @@
1From 0e3bfa22b23451531caf8cc30b1771ac6a41fcad Mon Sep 17 00:00:00 2001
2From: Carlos Garcia Campos <cgarcia@igalia.com>
3Date: Thu, 11 Feb 2021 10:47:09 +0100
4Subject: [PATCH] Remove http and https aliases support test
5
6Upstream has removed the whole function of http and https aliases
7support, this commit partially cherry pick it, only remove the test to
8mute the warning:
9| ../libsoup-2.74.3/tests/server-test.c: In function 'do_one_server_aliases_test':
10| ../libsoup-2.74.3/tests/server-test.c:180:17: warning: 'g_socket_client_set_tls_validation_flags' is deprecated [-Wdeprecated-declarations]
11| 180 | g_socket_client_set_tls_validation_flags (client, 0);
12| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
13
14Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/111ae4ebe7cc2e389573cff5b9ac76509d6cbac0]
15
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17---
18 tests/server-test.c | 104 --------------------------------------------
19 1 file changed, 104 deletions(-)
20
21diff --git a/tests/server-test.c b/tests/server-test.c
22index 8976103..cb7e815 100644
23--- a/tests/server-test.c
24+++ b/tests/server-test.c
25@@ -154,108 +154,6 @@ do_star_test (ServerData *sd, gconstpointer test_data)
26 soup_uri_free (star_uri);
27 }
28
29-static void
30-do_one_server_aliases_test (SoupURI *uri,
31- const char *alias,
32- gboolean succeed)
33-{
34- GSocketClient *client;
35- GSocketConnectable *addr;
36- GSocketConnection *conn;
37- GInputStream *in;
38- GOutputStream *out;
39- GError *error = NULL;
40- GString *req;
41- static char buf[1024];
42-
43- debug_printf (1, " %s via %s\n", alias, uri->scheme);
44-
45- /* There's no way to make libsoup's client side send an absolute
46- * URI (to a non-proxy server), so we have to fake this.
47- */
48-
49- client = g_socket_client_new ();
50- if (uri->scheme == SOUP_URI_SCHEME_HTTPS) {
51- g_socket_client_set_tls (client, TRUE);
52- g_socket_client_set_tls_validation_flags (client, 0);
53- }
54- addr = g_network_address_new (uri->host, uri->port);
55-
56- conn = g_socket_client_connect (client, addr, NULL, &error);
57- g_object_unref (addr);
58- g_object_unref (client);
59- if (!conn) {
60- g_assert_no_error (error);
61- g_error_free (error);
62- return;
63- }
64-
65- in = g_io_stream_get_input_stream (G_IO_STREAM (conn));
66- out = g_io_stream_get_output_stream (G_IO_STREAM (conn));
67-
68- req = g_string_new (NULL);
69- g_string_append_printf (req, "GET %s://%s:%d HTTP/1.1\r\n",
70- alias, uri->host, uri->port);
71- g_string_append_printf (req, "Host: %s:%d\r\n",
72- uri->host, uri->port);
73- g_string_append (req, "Connection: close\r\n\r\n");
74-
75- if (!g_output_stream_write_all (out, req->str, req->len, NULL, NULL, &error)) {
76- g_assert_no_error (error);
77- g_error_free (error);
78- g_object_unref (conn);
79- g_string_free (req, TRUE);
80- return;
81- }
82- g_string_free (req, TRUE);
83-
84- if (!g_input_stream_read_all (in, buf, sizeof (buf), NULL, NULL, &error)) {
85- g_assert_no_error (error);
86- g_error_free (error);
87- g_object_unref (conn);
88- return;
89- }
90-
91- if (succeed)
92- g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 200 "));
93- else
94- g_assert_true (g_str_has_prefix (buf, "HTTP/1.1 400 "));
95-
96- g_io_stream_close (G_IO_STREAM (conn), NULL, NULL);
97- g_object_unref (conn);
98-}
99-
100-static void
101-do_server_aliases_test (ServerData *sd, gconstpointer test_data)
102-{
103- char *http_aliases[] = { "dav", NULL };
104- char *https_aliases[] = { "davs", NULL };
105- char *http_good[] = { "http", "dav", NULL };
106- char *http_bad[] = { "https", "davs", "fred", NULL };
107- char *https_good[] = { "https", "davs", NULL };
108- char *https_bad[] = { "http", "dav", "fred", NULL };
109- int i;
110-
111- g_test_bug ("703694");
112-
113- g_object_set (G_OBJECT (sd->server),
114- SOUP_SERVER_HTTP_ALIASES, http_aliases,
115- SOUP_SERVER_HTTPS_ALIASES, https_aliases,
116- NULL);
117-
118- for (i = 0; http_good[i]; i++)
119- do_one_server_aliases_test (sd->base_uri, http_good[i], TRUE);
120- for (i = 0; http_bad[i]; i++)
121- do_one_server_aliases_test (sd->base_uri, http_bad[i], FALSE);
122-
123- if (tls_available) {
124- for (i = 0; https_good[i]; i++)
125- do_one_server_aliases_test (sd->ssl_base_uri, https_good[i], TRUE);
126- for (i = 0; https_bad[i]; i++)
127- do_one_server_aliases_test (sd->ssl_base_uri, https_bad[i], FALSE);
128- }
129-}
130-
131 static void
132 do_dot_dot_test (ServerData *sd, gconstpointer test_data)
133 {
134@@ -1382,8 +1280,6 @@ main (int argc, char **argv)
135
136 g_test_add ("/server/OPTIONS *", ServerData, NULL,
137 server_setup, do_star_test, server_teardown);
138- g_test_add ("/server/aliases", ServerData, NULL,
139- server_setup, do_server_aliases_test, server_teardown);
140 g_test_add ("/server/..-in-path", ServerData, NULL,
141 server_setup, do_dot_dot_test, server_teardown);
142 g_test_add ("/server/ipv6", ServerData, NULL,
143--
1442.34.1
145
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
new file mode 100644
index 0000000000..04713850e1
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52530.patch
@@ -0,0 +1,150 @@
1From 4a2bb98e03d79146c729dca52c8d6edc635218ff Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Mon, 8 Jul 2024 12:33:15 -0500
4Subject: [PATCH] headers: Strictly don't allow NUL bytes
5
6In the past (2015) this was allowed for some problematic sites. However Chromium also does not allow NUL bytes in either header names or values these days. So this should no longer be a problem.
7
8CVE: CVE-2024-52530
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/402/diffs?commit_id=04df03bc092ac20607f3e150936624d4f536e68b]
10
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 libsoup/soup-headers.c | 15 +++------
14 tests/header-parsing-test.c | 62 +++++++++++++++++--------------------
15 2 files changed, 32 insertions(+), 45 deletions(-)
16
17diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
18index eec28ad..e5d3c03 100644
19--- a/libsoup/soup-headers.c
20+++ b/libsoup/soup-headers.c
21@@ -50,13 +50,14 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
22 * ignorable trailing whitespace.
23 */
24
25+ /* No '\0's are allowed */
26+ if (memchr (str, '\0', len))
27+ return FALSE;
28+
29 /* Skip over the Request-Line / Status-Line */
30 headers_start = memchr (str, '\n', len);
31 if (!headers_start)
32 return FALSE;
33- /* No '\0's in the Request-Line / Status-Line */
34- if (memchr (str, '\0', headers_start - str))
35- return FALSE;
36
37 /* We work on a copy of the headers, which we can write '\0's
38 * into, so that we don't have to individually g_strndup and
39@@ -68,14 +69,6 @@ soup_headers_parse (const char *str, int len, SoupMessageHeaders *dest)
40 headers_copy[copy_len] = '\0';
41 value_end = headers_copy;
42
43- /* There shouldn't be any '\0's in the headers already, but
44- * this is the web we're talking about.
45- */
46- while ((p = memchr (headers_copy, '\0', copy_len))) {
47- memmove (p, p + 1, copy_len - (p - headers_copy));
48- copy_len--;
49- }
50-
51 while (*(value_end + 1)) {
52 name = value_end + 1;
53 name_end = strchr (name, ':');
54diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
55index 752196e..c1d3b33 100644
56--- a/tests/header-parsing-test.c
57+++ b/tests/header-parsing-test.c
58@@ -358,24 +358,6 @@ static struct RequestTest {
59 }
60 },
61
62- { "NUL in header name", "760832",
63- "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
64- SOUP_STATUS_OK,
65- "GET", "/", SOUP_HTTP_1_1,
66- { { "Host", "example.com" },
67- { NULL }
68- }
69- },
70-
71- { "NUL in header value", "760832",
72- "GET / HTTP/1.1\r\nHost: example\x00" "com\r\n", 35,
73- SOUP_STATUS_OK,
74- "GET", "/", SOUP_HTTP_1_1,
75- { { "Host", "examplecom" },
76- { NULL }
77- }
78- },
79-
80 /************************/
81 /*** INVALID REQUESTS ***/
82 /************************/
83@@ -448,6 +430,21 @@ static struct RequestTest {
84 SOUP_STATUS_EXPECTATION_FAILED,
85 NULL, NULL, -1,
86 { { NULL } }
87+ },
88+
89+ // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
90+ { "NUL in header name", NULL,
91+ "GET / HTTP/1.1\r\nHost\x00: example.com\r\n", 36,
92+ SOUP_STATUS_BAD_REQUEST,
93+ NULL, NULL, -1,
94+ { { NULL } }
95+ },
96+
97+ { "NUL in header value", NULL,
98+ "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
99+ SOUP_STATUS_BAD_REQUEST,
100+ NULL, NULL, -1,
101+ { { NULL } }
102 }
103 };
104 static const int num_reqtests = G_N_ELEMENTS (reqtests);
105@@ -620,22 +617,6 @@ static struct ResponseTest {
106 { NULL } }
107 },
108
109- { "NUL in header name", "760832",
110- "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
111- SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
112- { { "Foo", "bar" },
113- { NULL }
114- }
115- },
116-
117- { "NUL in header value", "760832",
118- "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
119- SOUP_HTTP_1_1, SOUP_STATUS_OK, "OK",
120- { { "Foo", "bar" },
121- { NULL }
122- }
123- },
124-
125 /********************************/
126 /*** VALID CONTINUE RESPONSES ***/
127 /********************************/
128@@ -768,6 +749,19 @@ static struct ResponseTest {
129 { { NULL }
130 }
131 },
132+
133+ // https://gitlab.gnome.org/GNOME/libsoup/-/issues/377
134+ { "NUL in header name", NULL,
135+ "HTTP/1.1 200 OK\r\nF\x00oo: bar\r\n", 28,
136+ -1, 0, NULL,
137+ { { NULL } }
138+ },
139+
140+ { "NUL in header value", "760832",
141+ "HTTP/1.1 200 OK\r\nFoo: b\x00" "ar\r\n", 28,
142+ -1, 0, NULL,
143+ { { NULL } }
144+ },
145 };
146 static const int num_resptests = G_N_ELEMENTS (resptests);
147
148--
1492.34.1
150
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
new file mode 100644
index 0000000000..9de0310c8d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-1.patch
@@ -0,0 +1,39 @@
1From 8331e681c85c3b1893d8d5193783f631bfc07acb Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 13:42:08 +0800
4Subject: [PATCH] tests: Add test for passing invalid UTF-8 to
5 soup_header_parse_semi_param_list()
6
7CVE: CVE-2024-52531
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=825fda3425546847b42ad5270544e9388ff349fe]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 tests/header-parsing-test.c | 11 +++++++++++
13 1 file changed, 11 insertions(+)
14
15diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
16index b811115..cfcc003 100644
17--- a/tests/header-parsing-test.c
18+++ b/tests/header-parsing-test.c
19@@ -836,6 +836,17 @@ static struct ParamListTest {
20 { "filename", "t\xC3\xA9st.txt" },
21 },
22 },
23+
24+/* This tests invalid UTF-8 data which *should* never be passed here but it was designed to be robust against it. */
25+ { TRUE,
26+ "invalid*=\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; filename*=iso-8859-1''\x69\x27\x27\x93\x93\x93\x93\xff\x61\x61\x61\x61\x61\x61\x61\x62\x63\x64\x65\x0a; foo",
27+ {
28+ { "filename", "i''\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
29+ { "invalid", "\302\223\302\223\302\223\302\223\303\277aaaaaaabcde" },
30+ { "foo", NULL },
31+ },
32+ }
33+
34 };
35 static const int num_paramlisttests = G_N_ELEMENTS (paramlisttests);
36
37--
382.34.1
39
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
new file mode 100644
index 0000000000..740c28c016
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52531-2.patch
@@ -0,0 +1,133 @@
1From 12523a592f1216450d18706bcf6c16e0f1ab0ce0 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 13:52:37 +0800
4Subject: [PATCH] headers: Be more robust against invalid input when
5 parsing params
6
7If you pass invalid input to a function such as soup_header_parse_param_list_strict()
8it can cause an overflow if it decodes the input to UTF-8.
9
10This should never happen with valid UTF-8 input which libsoup's client API
11ensures, however it's server API does not currently.
12
13CVE: CVE-2024-52531
14Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/407/diffs?commit_id=a35222dd0bfab2ac97c10e86b95f762456628283]
15
16Signed-off-by: Changqing Li <changqing.li@windriver.com>
17---
18 libsoup/soup-headers.c | 45 +++++++++++++++++++++---------------------
19 1 file changed, 23 insertions(+), 22 deletions(-)
20
21diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
22index 67905b2..39e8d34 100644
23--- a/libsoup/soup-headers.c
24+++ b/libsoup/soup-headers.c
25@@ -642,8 +642,9 @@ soup_header_contains (const char *header, const char *token)
26 }
27
28 static void
29-decode_quoted_string (char *quoted_string)
30+decode_quoted_string_inplace (GString *quoted_gstring)
31 {
32+ char *quoted_string = quoted_gstring->str;
33 char *src, *dst;
34
35 src = quoted_string + 1;
36@@ -657,10 +658,11 @@ decode_quoted_string (char *quoted_string)
37 }
38
39 static gboolean
40-decode_rfc5987 (char *encoded_string)
41+decode_rfc5987_inplace (GString *encoded_gstring)
42 {
43 char *q, *decoded;
44 gboolean iso_8859_1 = FALSE;
45+ const char *encoded_string = encoded_gstring->str;
46
47 q = strchr (encoded_string, '\'');
48 if (!q)
49@@ -689,14 +691,7 @@ decode_rfc5987 (char *encoded_string)
50 decoded = utf8;
51 }
52
53- /* If encoded_string was UTF-8, then each 3-character %-escape
54- * will be converted to a single byte, and so decoded is
55- * shorter than encoded_string. If encoded_string was
56- * iso-8859-1, then each 3-character %-escape will be
57- * converted into at most 2 bytes in UTF-8, and so it's still
58- * shorter.
59- */
60- strcpy (encoded_string, decoded);
61+ g_string_assign (encoded_gstring, decoded);
62 g_free (decoded);
63 return TRUE;
64 }
65@@ -706,15 +701,16 @@ parse_param_list (const char *header, char delim, gboolean strict)
66 {
67 GHashTable *params;
68 GSList *list, *iter;
69- char *item, *eq, *name_end, *value;
70- gboolean override, duplicated;
71
72 params = g_hash_table_new_full (soup_str_case_hash,
73 soup_str_case_equal,
74- g_free, NULL);
75+ g_free, g_free);
76
77 list = parse_list (header, delim);
78 for (iter = list; iter; iter = iter->next) {
79+ char *item, *eq, *name_end;
80+ gboolean override, duplicated;
81+ GString *parsed_value = NULL;
82 item = iter->data;
83 override = FALSE;
84
85@@ -729,19 +725,19 @@ parse_param_list (const char *header, char delim, gboolean strict)
86
87 *name_end = '\0';
88
89- value = (char *)skip_lws (eq + 1);
90+ parsed_value = g_string_new ((char *)skip_lws (eq + 1));
91
92 if (name_end[-1] == '*' && name_end > item + 1) {
93 name_end[-1] = '\0';
94- if (!decode_rfc5987 (value)) {
95+ if (!decode_rfc5987_inplace (parsed_value)) {
96+ g_string_free (parsed_value, TRUE);
97 g_free (item);
98 continue;
99 }
100 override = TRUE;
101- } else if (*value == '"')
102- decode_quoted_string (value);
103- } else
104- value = NULL;
105+ } else if (parsed_value->str[0] == '"')
106+ decode_quoted_string_inplace (parsed_value);
107+ }
108
109 duplicated = g_hash_table_lookup_extended (params, item, NULL, NULL);
110
111@@ -749,11 +745,16 @@ parse_param_list (const char *header, char delim, gboolean strict)
112 soup_header_free_param_list (params);
113 params = NULL;
114 g_slist_foreach (iter, (GFunc)g_free, NULL);
115+ if (parsed_value)
116+ g_string_free (parsed_value, TRUE);
117 break;
118- } else if (override || !duplicated)
119- g_hash_table_replace (params, item, value);
120- else
121+ } else if (override || !duplicated) {
122+ g_hash_table_replace (params, item, parsed_value ? g_string_free (parsed_value, FALSE) : NULL);
123+ } else {
124+ if (parsed_value)
125+ g_string_free (parsed_value, TRUE);
126 g_free (item);
127+ }
128 }
129
130 g_slist_free (list);
131--
1322.34.1
133
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
new file mode 100644
index 0000000000..cb1f096110
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-1.patch
@@ -0,0 +1,37 @@
1From a693d49bff058fc20a448dc4e7d324ff0dc6597e Mon Sep 17 00:00:00 2001
2From: Ignacio Casal Quinteiro <qignacio@amazon.com>
3Date: Wed, 11 Sep 2024 11:52:11 +0200
4Subject: [PATCH 1/3] websocket: process the frame as soon as we read data
5
6Otherwise we can enter in a read loop because we were not
7validating the data until the all the data was read.
8
9Fixes #391
10
11CVE: CVE-2024-52532
12Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/6adc0e3eb74c257ed4e2a23eb4b2774fdb0d67be#f1d67ca0386b145ea201cf88d27f72724d7c6715]
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15---
16 libsoup/soup-websocket-connection.c | 5 ++---
17 1 file changed, 2 insertions(+), 3 deletions(-)
18
19diff --git a/libsoup/soup-websocket-connection.c b/libsoup/soup-websocket-connection.c
20index a4095e1..65c1492 100644
21--- a/libsoup/soup-websocket-connection.c
22+++ b/libsoup/soup-websocket-connection.c
23@@ -1140,9 +1140,8 @@ soup_websocket_connection_read (SoupWebsocketConnection *self)
24 }
25
26 pv->incoming->len = len + count;
27- } while (count > 0);
28-
29- process_incoming (self);
30+ process_incoming (self);
31+ } while (count > 0 && !pv->close_sent && !pv->io_closing);
32
33 if (end) {
34 if (!pv->close_sent || !pv->close_received) {
35--
362.34.1
37
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
new file mode 100644
index 0000000000..dcadafe944
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-2.patch
@@ -0,0 +1,43 @@
1From f5b76410de1318f49844dacf6e68692522b6c856 Mon Sep 17 00:00:00 2001
2From: Ignacio Casal Quinteiro <qignacio@amazon.com>
3Date: Wed, 2 Oct 2024 11:17:19 +0200
4Subject: [PATCH] websocket-test: disconnect error copy after the test ends
5
6Otherwise the server will have already sent a few more wrong
7bytes and the client will continue getting errors to copy
8but the error is already != NULL and it will assert
9
10CVE: CVE-2024-52532
11Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/29b96fab2512666d7241e46c98cc45b60b795c0c]
12
13Signed-off-by: Changqing Li <changqing.li@windriver.com>
14---
15 tests/websocket-test.c | 5 ++++-
16 1 file changed, 4 insertions(+), 1 deletion(-)
17
18diff --git a/tests/websocket-test.c b/tests/websocket-test.c
19index 5e40cf3..1ec9ff6 100644
20--- a/tests/websocket-test.c
21+++ b/tests/websocket-test.c
22@@ -1331,8 +1331,9 @@ test_receive_invalid_encode_length_64 (Test *test,
23 GError *error = NULL;
24 InvalidEncodeLengthTest context = { test, NULL };
25 guint i;
26+ guint error_id;
27
28- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
29+ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
30 g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
31
32 /* We use 127(\x7f) as payload length with 65535 extended length */
33@@ -1345,6 +1346,7 @@ test_receive_invalid_encode_length_64 (Test *test,
34 WAIT_UNTIL (error != NULL || received != NULL);
35 g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
36 g_clear_error (&error);
37+ g_signal_handler_disconnect (test->client, error_id);
38 g_assert_null (received);
39
40 g_thread_join (thread);
41--
422.34.1
43
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
new file mode 100644
index 0000000000..ab6af72291
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2024-52532-3.patch
@@ -0,0 +1,48 @@
1From d97bb2e340f5a6d7e56a7738403f9d18bc406b70 Mon Sep 17 00:00:00 2001
2From: Simon McVittie <smcv@debian.org>
3Date: Wed, 13 Nov 2024 14:14:23 +0000
4Subject: [PATCH 3/3] websocket-test: Disconnect error signal in another place
5
6This is the same change as commit 29b96fab "websocket-test: disconnect
7error copy after the test ends", and is done for the same reason, but
8replicating it into a different function.
9
10Fixes: 6adc0e3e "websocket: process the frame as soon as we read data"
11Resolves: https://gitlab.gnome.org/GNOME/libsoup/-/issues/399
12Signed-off-by: Simon McVittie <smcv@debian.org>
13
14CVE: CVE-2024-52532
15Upstream-Status: Backport
16[https://gitlab.gnome.org/GNOME/libsoup/-/commit/4c9e75c6676a37b6485620c332e568e1a3f530ff]
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19---
20 tests/websocket-test.c | 4 +++-
21 1 file changed, 3 insertions(+), 1 deletion(-)
22
23diff --git a/tests/websocket-test.c b/tests/websocket-test.c
24index 2b19a7b..0699a06 100644
25--- a/tests/websocket-test.c
26+++ b/tests/websocket-test.c
27@@ -1300,8 +1300,9 @@ test_receive_invalid_encode_length_16 (Test *test,
28 GError *error = NULL;
29 InvalidEncodeLengthTest context = { test, NULL };
30 guint i;
31+ guint error_id;
32
33- g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
34+ error_id = g_signal_connect (test->client, "error", G_CALLBACK (on_error_copy), &error);
35 g_signal_connect (test->client, "message", G_CALLBACK (on_binary_message), &received);
36
37 /* We use 126(~) as payload length with 125 extended length */
38@@ -1314,6 +1315,7 @@ test_receive_invalid_encode_length_16 (Test *test,
39 WAIT_UNTIL (error != NULL || received != NULL);
40 g_assert_error (error, SOUP_WEBSOCKET_ERROR, SOUP_WEBSOCKET_CLOSE_PROTOCOL_ERROR);
41 g_clear_error (&error);
42+ g_signal_handler_disconnect (test->client, error_id);
43 g_assert_null (received);
44
45 g_thread_join (thread);
46--
472.34.1
48
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
new file mode 100644
index 0000000000..106f907168
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-2784.patch
@@ -0,0 +1,56 @@
1From 2eacbd762332795e00692ddab2515c6da23198d3 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 May 2025 14:06:41 +0800
4Subject: [PATCH] sniffer: Add better coverage of skip_insignificant_space()
5
6CVE: CVE-2025-2784
7Upstream-Status: Backport
8[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/435/diffs?commit_id=242a10fbb12dbdc12d254bd8fc8669a0ac055304;
9 https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/442/diffs?commit_id=c415ad0b6771992e66c70edf373566c6e247089d]
10
11Test code is not added since it uses some functions not defined in
12version 2.74. These tests are not used now, so just ignore them.
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15---
16 libsoup/soup-content-sniffer.c | 9 +++----
17 1 files changed, 3 insertions(+), 4 deletions(-)
18
19diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
20index 5f2896e..9554636 100644
21--- a/libsoup/soup-content-sniffer.c
22+++ b/libsoup/soup-content-sniffer.c
23@@ -612,8 +612,10 @@ sniff_text_or_binary (SoupContentSniffer *sniffer, SoupBuffer *buffer)
24 }
25
26 static gboolean
27-skip_insignificant_space (const char *resource, int *pos, int resource_length)
28+skip_insignificant_space (const char *resource, gsize *pos, gsize resource_length)
29 {
30+ if (*pos >= resource_length)
31+ return TRUE;
32 while ((resource[*pos] == '\x09') ||
33 (resource[*pos] == '\x20') ||
34 (resource[*pos] == '\x0A') ||
35@@ -632,7 +634,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
36 {
37 const char *resource = (const char *)buffer->data;
38 int resource_length = MIN (512, buffer->length);
39- int pos = 0;
40+ gsize pos = 0;
41
42 if (resource_length < 3)
43 goto text_html;
44@@ -642,9 +644,6 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
45 pos = 3;
46
47 look_for_tag:
48- if (pos > resource_length)
49- goto text_html;
50-
51 if (skip_insignificant_space (resource, &pos, resource_length))
52 goto text_html;
53
54--
552.34.1
56
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
new file mode 100644
index 0000000000..c032846ef0
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32050.patch
@@ -0,0 +1,29 @@
1From 5709dfffb6fdc5b66ce001bf82a755ad8ad1d992 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Mon, 28 Oct 2024 12:29:48 -0500
4Subject: [PATCH] Fix using int instead of size_t for strcspn return
5
6CVE: CVE-2025-32050
7Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/9bb0a55de55c6940ced811a64fbca82fe93a9323]
8
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11 libsoup/soup-headers.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
15index 9707ca0..67905b2 100644
16--- a/libsoup/soup-headers.c
17+++ b/libsoup/soup-headers.c
18@@ -902,7 +902,7 @@ append_param_quoted (GString *string,
19 const char *name,
20 const char *value)
21 {
22- int len;
23+ gsize len;
24
25 g_string_append (string, name);
26 g_string_append (string, "=\"");
27--
282.34.1
29
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
new file mode 100644
index 0000000000..34bc8113a4
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32052.patch
@@ -0,0 +1,32 @@
1From f4a67a9a3033586edaee715d40d5992e02d32893 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Sat, 16 Nov 2024 12:07:30 -0600
4Subject: [PATCH] Fix heap buffer overflow in soup_content_sniffer_sniff
5
6Co-Author: Ar Jun <pkillarjun@protonmail.com>
7
8CVE: CVE-2025-32052
9Upstream-Status: Backport
10[https://gitlab.gnome.org/GNOME/libsoup/-/commit/f182429e5b1fc034050510da20c93256c4fa9652#500da7cfde649872c49169be34b03a1c42a53ddb]
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13---
14 libsoup/soup-content-sniffer.c | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
18index 9554636..eac9e7b 100644
19--- a/libsoup/soup-content-sniffer.c
20+++ b/libsoup/soup-content-sniffer.c
21@@ -504,7 +504,7 @@ sniff_unknown (SoupContentSniffer *sniffer, SoupBuffer *buffer,
22 guint index_pattern = 0;
23 gboolean skip_row = FALSE;
24
25- while ((index_stream < resource_length) &&
26+ while ((index_stream < resource_length - 1) &&
27 (index_pattern <= type_row->pattern_length)) {
28 /* Skip insignificant white space ("WS" in the spec) */
29 if (type_row->pattern[index_pattern] == ' ') {
30--
312.34.1
32
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
new file mode 100644
index 0000000000..0d829d6200
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32053.patch
@@ -0,0 +1,39 @@
1From d9bcffd6cd5e8ec32889a594f7348d67a5101b3a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 May 2025 13:58:42 +0800
4Subject: [PATCH] Fix heap buffer overflow in
5 soup-content-sniffer.c:sniff_feed_or_html()
6
7CVE: CVE-2025-32053
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/eaed42ca8d40cd9ab63764e3d63641180505f40a]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 libsoup/soup-content-sniffer.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
16index 967ec61..5f2896e 100644
17--- a/libsoup/soup-content-sniffer.c
18+++ b/libsoup/soup-content-sniffer.c
19@@ -620,7 +620,7 @@ skip_insignificant_space (const char *resource, int *pos, int resource_length)
20 (resource[*pos] == '\x0D')) {
21 *pos = *pos + 1;
22
23- if (*pos > resource_length)
24+ if (*pos >= resource_length)
25 return TRUE;
26 }
27
28@@ -682,7 +682,7 @@ sniff_feed_or_html (SoupContentSniffer *sniffer, SoupBuffer *buffer)
29 do {
30 pos++;
31
32- if (pos > resource_length)
33+ if ((pos + 1) > resource_length)
34 goto text_html;
35 } while (resource[pos] != '>');
36
37--
382.34.1
39
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch
new file mode 100644
index 0000000000..c33ebf8056
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32906.patch
@@ -0,0 +1,71 @@
1From 4b8809cca4bbcbf9514314d86227f985362258b0 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Wed, 12 Feb 2025 11:30:02 -0600
4Subject: [PATCH] headers: Handle parsing only newlines
5
6Closes #404
7Closes #407
8
9CVE: CVE-2025-32906
10Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/af5b9a4a3945c52b940d5ac181ef51bb12011f1f]
11
12Signed-off-by: Changqing Li <changqing.li@windriver.com>
13---
14 libsoup/soup-headers.c | 4 ++--
15 tests/header-parsing-test.c | 11 +++++++++++
16 2 files changed, 13 insertions(+), 2 deletions(-)
17
18diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
19index e5d3c03..87bb3dc 100644
20--- a/libsoup/soup-headers.c
21+++ b/libsoup/soup-headers.c
22@@ -185,7 +185,7 @@ soup_headers_parse_request (const char *str,
23 /* RFC 2616 4.1 "servers SHOULD ignore any empty line(s)
24 * received where a Request-Line is expected."
25 */
26- while ((*str == '\r' || *str == '\n') && len > 0) {
27+ while (len > 0 && (*str == '\r' || *str == '\n')) {
28 str++;
29 len--;
30 }
31@@ -369,7 +369,7 @@ soup_headers_parse_response (const char *str,
32 * after a response, which we then see prepended to the next
33 * response on that connection.
34 */
35- while ((*str == '\r' || *str == '\n') && len > 0) {
36+ while (len > 0 && (*str == '\r' || *str == '\n')) {
37 str++;
38 len--;
39 }
40diff --git a/tests/header-parsing-test.c b/tests/header-parsing-test.c
41index c1d3b33..b811115 100644
42--- a/tests/header-parsing-test.c
43+++ b/tests/header-parsing-test.c
44@@ -6,6 +6,10 @@ typedef struct {
45 const char *name, *value;
46 } Header;
47
48+static char only_newlines[] = {
49+ '\n', '\n', '\n', '\n'
50+};
51+
52 static struct RequestTest {
53 const char *description;
54 const char *bugref;
55@@ -445,6 +449,13 @@ static struct RequestTest {
56 SOUP_STATUS_BAD_REQUEST,
57 NULL, NULL, -1,
58 { { NULL } }
59+ },
60+
61+ { "Only newlines", NULL,
62+ only_newlines, sizeof (only_newlines),
63+ SOUP_STATUS_BAD_REQUEST,
64+ NULL, NULL, -1,
65+ { { NULL } }
66 }
67 };
68 static const int num_reqtests = G_N_ELEMENTS (reqtests);
69--
702.34.1
71
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
new file mode 100644
index 0000000000..41dd3ff3f4
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32907.patch
@@ -0,0 +1,39 @@
1From 8158b4084dcba2a233dfcb7359c53ab2840148f7 Mon Sep 17 00:00:00 2001
2From: Milan Crha <mcrha@redhat.com>
3Date: Tue, 15 Apr 2025 12:17:39 +0200
4Subject: [PATCH 1/2] soup-message-headers: Correct merge of ranges
5
6It had been skipping every second range, which generated an array
7of a lot of insane ranges, causing large memory usage by the server.
8
9Closes #428
10
11Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452>
12
13CVE: CVE-2025-32907
14Upstream-Status: Backport
15[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/452/diffs?commit_id=9bb92f7a685e31e10e9e8221d0342280432ce836]
16
17Test part not applied since test codes use some functions not in this
18version
19
20Signed-off-by: Changqing Li <changqing.li@windriver.com>
21---
22 libsoup/soup-message-headers.c | 1 +
23 1 files changed, 1 insertions(+)
24
25diff --git a/libsoup/soup-message-headers.c b/libsoup/soup-message-headers.c
26index 78b2455..00b9763 100644
27--- a/libsoup/soup-message-headers.c
28+++ b/libsoup/soup-message-headers.c
29@@ -1024,6 +1024,7 @@ soup_message_headers_get_ranges_internal (SoupMessageHeaders *hdrs,
30 if (cur->start <= prev->end) {
31 prev->end = MAX (prev->end, cur->end);
32 g_array_remove_index (array, i);
33+ i--;
34 }
35 }
36 }
37--
382.34.1
39
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
new file mode 100644
index 0000000000..2f5366348d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32909.patch
@@ -0,0 +1,38 @@
1From e6e088e62c10ab91fa2f2ad5c122332aa7cde97c Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 May 2025 16:55:37 +0800
4Subject: [PATCH] content-sniffer: Handle sniffing resource shorter than
5 4 bytes
6
7CVE: CVE-2025-32909
8Upstream-Status: Backport
9[https://gitlab.gnome.org/GNOME/libsoup/-/commit/ba4c3a6f988beff59e45801ab36067293d24ce92]
10
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 libsoup/soup-content-sniffer.c | 7 ++++++-
14 1 file changed, 6 insertions(+), 1 deletion(-)
15
16diff --git a/libsoup/soup-content-sniffer.c b/libsoup/soup-content-sniffer.c
17index eac9e7b..73d2245 100644
18--- a/libsoup/soup-content-sniffer.c
19+++ b/libsoup/soup-content-sniffer.c
20@@ -227,9 +227,14 @@ sniff_mp4 (SoupContentSniffer *sniffer, SoupBuffer *buffer)
21 {
22 const char *resource = (const char *)buffer->data;
23 guint resource_length = MIN (512, buffer->length);
24- guint32 box_size = *((guint32*)resource);
25+ guint32 box_size;
26 guint i;
27
28+ if (resource_length < sizeof (guint32))
29+ return FALSE;
30+
31+ box_size = *((guint32*)resource);
32+
33 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
34 box_size = ((box_size >> 24) |
35 ((box_size << 8) & 0x00FF0000) |
36--
372.34.1
38
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
new file mode 100644
index 0000000000..c1dc6860f2
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-1.patch
@@ -0,0 +1,32 @@
1From a7e711d0f162c6edc8acad2a96981d4890784ea3 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 May 2025 17:02:55 +0800
4Subject: [PATCH] auth-digest: Handle missing realm/nonce in authenticate
5 header
6
7CVE: CVE-2025-32910
8Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=e40df6d48a1cbab56f5d15016cc861a503423cfe]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11---
12 libsoup/soup-auth-digest.c | 3 +++
13 1 files changed, 3 insertions(+)
14
15diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
16index e8ba990..0ab3499 100644
17--- a/libsoup/soup-auth-digest.c
18+++ b/libsoup/soup-auth-digest.c
19@@ -142,6 +142,9 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
20 guint qop_options;
21 gboolean ok = TRUE;
22
23+ if (!soup_auth_get_realm (auth))
24+ return FALSE;
25+
26 g_free (priv->domain);
27 g_free (priv->nonce);
28 g_free (priv->opaque);
29
30--
312.34.1
32
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
new file mode 100644
index 0000000000..019a35e3be
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-2.patch
@@ -0,0 +1,94 @@
1From eccfca1074fc485a0b60dfb9c8385429a226bf73 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 13:19:38 +0800
4Subject: [PATCH] auth-digest: Handle missing nonce
5
6CVE: CVE-2025-32910
7Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=405a8a34597a44bd58c4759e7d5e23f02c3b556a]
8
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11 libsoup/soup-auth-digest.c | 45 ++++++++++++++++++++++++++++----------
12 1 files changed, 28 insertions(+), 10 deletions(-)
13
14diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
15index 0ab3499..10a8591 100644
16--- a/libsoup/soup-auth-digest.c
17+++ b/libsoup/soup-auth-digest.c
18@@ -132,6 +132,19 @@ soup_auth_digest_get_qop (SoupAuthDigestQop qop)
19 return g_string_free (out, FALSE);
20 }
21
22+static gboolean
23+validate_params (SoupAuthDigest *auth_digest)
24+{
25+ SoupAuthDigestPrivate *priv = soup_auth_digest_get_instance_private (auth_digest);
26+
27+ if (priv->qop || priv->algorithm == SOUP_AUTH_DIGEST_ALGORITHM_MD5_SESS) {
28+ if (!priv->nonce)
29+ return FALSE;
30+ }
31+
32+ return TRUE;
33+}
34+
35 static gboolean
36 soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
37 GHashTable *auth_params)
38@@ -169,17 +182,22 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
39 if (priv->algorithm == -1)
40 ok = FALSE;
41
42- stale = g_hash_table_lookup (auth_params, "stale");
43- if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
44- recompute_hex_a1 (priv);
45- else {
46- g_free (priv->user);
47- priv->user = NULL;
48- g_free (priv->cnonce);
49- priv->cnonce = NULL;
50- memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
51- memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
52- }
53+ if (!validate_params (auth_digest))
54+ ok = FALSE;
55+
56+ if (ok) {
57+ stale = g_hash_table_lookup (auth_params, "stale");
58+ if (stale && !g_ascii_strcasecmp (stale, "TRUE") && *priv->hex_urp)
59+ recompute_hex_a1 (priv);
60+ else {
61+ g_free (priv->user);
62+ priv->user = NULL;
63+ g_free (priv->cnonce);
64+ priv->cnonce = NULL;
65+ memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
66+ memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
67+ }
68+ }
69
70 return ok;
71 }
72@@ -359,6 +377,8 @@ soup_auth_digest_compute_response (const char *method,
73 if (qop) {
74 char tmp[9];
75
76+ g_assert (cnonce);
77+
78 g_snprintf (tmp, 9, "%.8x", nc);
79 g_checksum_update (checksum, (guchar *)tmp, strlen (tmp));
80 g_checksum_update (checksum, (guchar *)":", 1);
81@@ -422,6 +442,9 @@ soup_auth_digest_get_authorization (SoupAuth *auth, SoupMessage *msg)
82 g_return_val_if_fail (uri != NULL, NULL);
83 url = soup_uri_to_string (uri, TRUE);
84
85+ g_assert (priv->nonce);
86+ g_assert (!priv->qop || priv->cnonce);
87+
88 soup_auth_digest_compute_response (msg->method, url, priv->hex_a1,
89 priv->qop, priv->nonce,
90 priv->cnonce, priv->nc,
91
92--
932.34.1
94
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
new file mode 100644
index 0000000000..bdf4d64ca3
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32910-3.patch
@@ -0,0 +1,28 @@
1From 74c95d54fe42041fe161cb74c76d942ffd37a5dd Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 13:21:43 +0800
4Subject: [PATCH] auth-digest: Fix leak
5
6CVE: CVE-2025-32910
7Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/417/diffs?commit_id=ea16eeacb052e423eb5c3b0b705e5eab34b13832]
8
9Signed-off-by: Changqing Li <changqing.li@windriver.com>
10---
11 libsoup/soup-auth-digest.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
15index 10a8591..6d965d2 100644
16--- a/libsoup/soup-auth-digest.c
17+++ b/libsoup/soup-auth-digest.c
18@@ -66,6 +66,7 @@ soup_auth_digest_finalize (GObject *object)
19 g_free (priv->nonce);
20 g_free (priv->domain);
21 g_free (priv->cnonce);
22+ g_free (priv->opaque);
23
24 memset (priv->hex_urp, 0, sizeof (priv->hex_urp));
25 memset (priv->hex_a1, 0, sizeof (priv->hex_a1));
26--
272.34.1
28
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch
new file mode 100644
index 0000000000..b3ce9d8bc3
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32912.patch
@@ -0,0 +1,32 @@
1From 0984dddb11daf14fdf5ca24077cd0ebda796439a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 13:25:32 +0800
4Subject: [PATCH] auth-digest: Handle missing nonce
5
6CVE: CVE-2025-32912
7Upstream-Status: Backport
8[https://gitlab.gnome.org/GNOME/libsoup/-/commit/cd077513f267e43ce4b659eb18a1734d8a369992?merge_request_iid=434
9https://gitlab.gnome.org/GNOME/libsoup/-/commit/910ebdcd3dd82386717a201c13c834f3a63eed7f]
10
11Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 libsoup/soup-auth-digest.c | 2 +-
14 1 files changed, 1 insertions(+), 1 deletion(-)
15
16diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
17index 6d965d2..f1621ec 100644
18--- a/libsoup/soup-auth-digest.c
19+++ b/libsoup/soup-auth-digest.c
20@@ -156,7 +156,7 @@ soup_auth_digest_update (SoupAuth *auth, SoupMessage *msg,
21 guint qop_options;
22 gboolean ok = TRUE;
23
24- if (!soup_auth_get_realm (auth))
25+ if (!soup_auth_get_realm (auth) || !g_hash_table_lookup (auth_params, "nonce"))
26 return FALSE;
27
28 g_free (priv->domain);
29
30--
312.34.1
32
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
new file mode 100644
index 0000000000..9f3bb21a25
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-32914.patch
@@ -0,0 +1,35 @@
1From ac844b9fc7945c38ea21fb7cf1a49a5c226d7c9c Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 12 May 2025 16:17:20 +0800
4Subject: [PATCH] Resolve "(CVE-2025-32914) (#YWH-PGM9867-23) OOB Read on
5 libsoup through function "soup_multipart_new_from_message" in
6 soup-multipart.c leads to crash or exit of process"
7
8CVE: CVE-2025-32914
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/450/diffs?commit_id=5bfcf8157597f2d327050114fb37ff600004dbcf]
10
11Test code are not added since some functions not aligned with version
122.74.3
13
14Signed-off-by: Changqing Li <changqing.li@windriver.com>
15---
16 libsoup/soup-multipart.c | 2 +-
17 1 files changed, 1 insertions(+), 1 deletion(-)
18
19diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
20index a7e550f..dd93973 100644
21--- a/libsoup/soup-multipart.c
22+++ b/libsoup/soup-multipart.c
23@@ -181,7 +181,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
24 return NULL;
25 }
26
27- split = strstr (start, "\r\n\r\n");
28+ split = g_strstr_len (start, body_end - start, "\r\n\r\n");
29 if (!split || split > end) {
30 soup_multipart_free (multipart);
31 soup_buffer_free (flattened);
32
33--
342.34.1
35
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
new file mode 100644
index 0000000000..874f62e7ad
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4476.patch
@@ -0,0 +1,38 @@
1From 52a0f9234d384b9dab368835b22e5a5a01542168 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 16 May 2025 14:16:10 +0800
4Subject: [PATCH] auth-digest: fix crash in
5 soup_auth_digest_get_protection_space()
6
7We need to validate the Domain parameter in the WWW-Authenticate header.
8
9Unfortunately this crash only occurs when listening on default ports 80
10and 443, so there's no good way to test for this. The test would require
11running as root.
12
13Fixes #440
14
15CVE: CVE-2025-4476
16Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/commit/e64c221f9c7d09b48b610c5626b3b8c400f0907c?merge_request_iid=457]
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19---
20 libsoup/soup-auth-digest.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/libsoup/soup-auth-digest.c b/libsoup/soup-auth-digest.c
24index f1621ec..a2dc560 100644
25--- a/libsoup/soup-auth-digest.c
26+++ b/libsoup/soup-auth-digest.c
27@@ -229,7 +229,7 @@ soup_auth_digest_get_protection_space (SoupAuth *auth, SoupURI *source_uri)
28 uri = soup_uri_new (d);
29 if (uri && uri->scheme == source_uri->scheme &&
30 uri->port == source_uri->port &&
31- !strcmp (uri->host, source_uri->host))
32+ !g_strcmp0 (uri->host, source_uri->host))
33 dir = g_strdup (uri->path);
34 else
35 dir = NULL;
36--
372.34.1
38
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
new file mode 100644
index 0000000000..c970661694
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46420.patch
@@ -0,0 +1,61 @@
1From 81e03c538d6a102406114567f4f1c468033ce2e4 Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Thu, 26 Dec 2024 18:31:42 -0600
4Subject: [PATCH] soup_header_parse_quality_list: Fix leak
5
6When iterating over the parsed list we now steal the allocated strings that we want and then free_full the list which may contain remaining strings.
7
8CVE: CVE-2025-46420
9Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/421/diffs?commit_id=c9083869ec2a3037e6df4bd86b45c419ba295f8e]
10
11 Signed-off-by: Changqing Li <changqing.li@windriver.com>
12---
13 libsoup/soup-headers.c | 11 +++++------
14 1 file changed, 5 insertions(+), 6 deletions(-)
15
16diff --git a/libsoup/soup-headers.c b/libsoup/soup-headers.c
17index 87bb3dc..9707ca0 100644
18--- a/libsoup/soup-headers.c
19+++ b/libsoup/soup-headers.c
20@@ -528,7 +528,7 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
21 GSList *unsorted;
22 QualityItem *array;
23 GSList *sorted, *iter;
24- char *item, *semi;
25+ char *semi;
26 const char *param, *equal, *value;
27 double qval;
28 int n;
29@@ -541,9 +541,8 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
30 unsorted = soup_header_parse_list (header);
31 array = g_new0 (QualityItem, g_slist_length (unsorted));
32 for (iter = unsorted, n = 0; iter; iter = iter->next) {
33- item = iter->data;
34 qval = 1.0;
35- for (semi = strchr (item, ';'); semi; semi = strchr (semi + 1, ';')) {
36+ for (semi = strchr (iter->data, ';'); semi; semi = strchr (semi + 1, ';')) {
37 param = skip_lws (semi + 1);
38 if (*param != 'q')
39 continue;
40@@ -575,15 +574,15 @@ soup_header_parse_quality_list (const char *header, GSList **unacceptable)
41 if (qval == 0.0) {
42 if (unacceptable) {
43 *unacceptable = g_slist_prepend (*unacceptable,
44- item);
45+ g_steal_pointer (&iter->data));
46 }
47 } else {
48- array[n].item = item;
49+ array[n].item = g_steal_pointer (&iter->data);
50 array[n].qval = qval;
51 n++;
52 }
53 }
54- g_slist_free (unsorted);
55+ g_slist_free_full (unsorted, g_free);
56
57 qsort (array, n, sizeof (QualityItem), sort_by_qval);
58 sorted = NULL;
59--
602.34.1
61
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
new file mode 100644
index 0000000000..3318093400
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-46421.patch
@@ -0,0 +1,47 @@
1From 5eb225f02bb35de56cfeedd87bde716bf1cb750b Mon Sep 17 00:00:00 2001
2From: Patrick Griffis <pgriffis@igalia.com>
3Date: Wed, 5 Feb 2025 16:18:10 -0600
4Subject: [PATCH] session: Strip authentication credentails on
5 cross-origin redirect
6
7This should match the behavior of Firefox and Safari but not of Chromium.
8
9CVE: CVE-2025-46421
10Upstream-Status: Backport
11[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/436/diffs?commit_id=3e5c26415811f19e7737238bb23305ffaf96f66b]
12
13Test code not added since it included some headers not in version 2.74.3
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 libsoup/soup-session.c | 8 ++++-
18 2 files changed, 85 insertions(+), 1 deletion(-)
19
20diff --git a/libsoup/soup-session.c b/libsoup/soup-session.c
21index 83421ef..8d6ac61 100644
22--- a/libsoup/soup-session.c
23+++ b/libsoup/soup-session.c
24@@ -1189,12 +1189,18 @@ soup_session_redirect_message (SoupSession *session, SoupMessage *msg)
25 SOUP_ENCODING_NONE);
26 }
27
28+ /* Strip all credentials on cross-origin redirect. */
29+ if (!soup_uri_host_equal (soup_message_get_uri (msg), new_uri)) {
30+ soup_message_headers_remove (msg->request_headers, "Authorization");
31+ soup_message_set_auth (msg, NULL);
32+ }
33+
34 soup_message_set_uri (msg, new_uri);
35 soup_uri_free (new_uri);
36
37 soup_session_requeue_message (session, msg);
38 return TRUE;
39-}
40+}
41
42 static void
43 redirect_handler (SoupMessage *msg, gpointer user_data)
44
45--
462.34.1
47
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
new file mode 100644
index 0000000000..b15b8c763d
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4948.patch
@@ -0,0 +1,38 @@
1From dfdc9b3cc73e6fe88cc12792ba00e14642572339 Mon Sep 17 00:00:00 2001
2From: Milan Crha <mcrha@redhat.com>
3Date: Thu, 15 May 2025 17:49:11 +0200
4Subject: [PATCH] soup-multipart: Verify boundary limits for multipart body
5
6It could happen that the boundary started at a place which resulted into
7a negative number, which in an unsigned integer is a very large value.
8Check the body size is not a negative value before setting it.
9
10Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/449
11
12Part-of: <https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463>
13
14CVE: CVE-2025-4948
15Upstream-Status: Backport
16[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/463/diffs?commit_id=f2f28afe0b3b2b3009ab67d6874457ec6bac70c0]
17
18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19---
20 libsoup/soup-multipart.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
24index dd93973..ce2fc10 100644
25--- a/libsoup/soup-multipart.c
26+++ b/libsoup/soup-multipart.c
27@@ -214,7 +214,7 @@ soup_multipart_new_from_message (SoupMessageHeaders *headers,
28 */
29 part_body = soup_buffer_new_subbuffer (flattened,
30 split - flattened->data,
31- end - 2 - split);
32+ end - 2 >= split ? end - 2 - split : 0);
33 g_ptr_array_add (multipart->bodies, part_body);
34
35 start = end;
36--
372.34.1
38
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
new file mode 100644
index 0000000000..7bc3e8da99
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4/CVE-2025-4969.patch
@@ -0,0 +1,37 @@
1From a7d0c58608ed830bedfb6b92aea11e00feb55aa9 Mon Sep 17 00:00:00 2001
2From: Milan Crha <mcrha@redhat.com>
3Date: Mon, 19 May 2025 17:48:27 +0200
4Subject: [PATCH] soup-multipart: Verify array bounds before accessing its
5 members
6
7The boundary could be at a place which, calculated, pointed
8before the beginning of the array. Check the bounds, to avoid
9read out of the array bounds.
10
11Closes https://gitlab.gnome.org/GNOME/libsoup/-/issues/447
12
13CVE: CVE-2025-4969
14Upstream-Status: Backport
15[https://gitlab.gnome.org/GNOME/libsoup/-/merge_requests/467/diffs?commit_id=b5b4dd10d4810f0c87b4eaffe88504f06e502f33]
16
17Signed-off-by: Changqing Li <changqing.li@windriver.com>
18---
19 libsoup/soup-multipart.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/libsoup/soup-multipart.c b/libsoup/soup-multipart.c
23index ce2fc10..a29cdf0 100644
24--- a/libsoup/soup-multipart.c
25+++ b/libsoup/soup-multipart.c
26@@ -108,7 +108,7 @@ find_boundary (const char *start, const char *end,
27 continue;
28
29 /* Check that it's at start of line */
30- if (!(b == start || (b[-1] == '\n' && b[-2] == '\r')))
31+ if (!(b == start || (b - start >= 2 && b[-1] == '\n' && b[-2] == '\r')))
32 continue;
33
34 /* Check for "--" or "\r\n" after boundary */
35--
362.34.1
37
diff --git a/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
new file mode 100644
index 0000000000..cbc886a2cb
--- /dev/null
+++ b/meta-oe/recipes-support/libsoup/libsoup-2.4_2.74.3.bb
@@ -0,0 +1,86 @@
1SUMMARY = "An HTTP library implementation in C"
2DESCRIPTION = "libsoup is an HTTP client/server library for GNOME. It uses GObjects \
3and the glib main loop, to integrate well with GNOME applications."
4HOMEPAGE = "https://wiki.gnome.org/Projects/libsoup"
5BUGTRACKER = "https://bugzilla.gnome.org/"
6SECTION = "x11/gnome/libs"
7LICENSE = "LGPL-2.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
9
10DEPENDS = "glib-2.0 glib-2.0-native libxml2 sqlite3 libpsl"
11
12SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}"
13
14SRC_URI = "${GNOME_MIRROR}/libsoup/${SHRT_VER}/libsoup-${PV}.tar.xz \
15 file://0001-Fix-build-with-libxml2-2.12.0-and-clang-17.patch \
16 file://0001-CVE-2025-32911.patch \
17 file://0001-Fix-possibly-uninitialized-warnings.patch \
18 file://0001-Remove-http-and-https-aliases-support-test.patch \
19 file://CVE-2024-52532-1.patch \
20 file://CVE-2024-52532-2.patch \
21 file://CVE-2024-52532-3.patch \
22 file://CVE-2025-32053.patch \
23 file://CVE-2025-2784.patch \
24 file://CVE-2024-52530.patch \
25 file://CVE-2025-32906.patch \
26 file://CVE-2025-32914.patch \
27 file://CVE-2025-46420.patch \
28 file://CVE-2025-46421.patch \
29 file://CVE-2025-32050.patch \
30 file://CVE-2025-32052.patch \
31 file://CVE-2025-32909.patch \
32 file://CVE-2025-32910-1.patch \
33 file://CVE-2025-32910-2.patch \
34 file://CVE-2025-32910-3.patch \
35 file://CVE-2025-32912.patch \
36 file://CVE-2024-52531-1.patch \
37 file://CVE-2024-52531-2.patch \
38 file://CVE-2025-4476.patch \
39 file://CVE-2025-32907.patch \
40 file://CVE-2025-4948.patch \
41 file://CVE-2025-4969.patch \
42"
43SRC_URI[sha256sum] = "e4b77c41cfc4c8c5a035fcdc320c7bc6cfb75ef7c5a034153df1413fa1d92f13"
44
45CVE_PRODUCT = "libsoup"
46
47S = "${UNPACKDIR}/libsoup-${PV}"
48
49inherit meson gettext pkgconfig upstream-version-is-even gobject-introspection gtk-doc
50
51UPSTREAM_CHECK_REGEX = "libsoup-(?P<pver>2(\.(?!99)\d+)+)\.tar"
52
53GIR_MESON_ENABLE_FLAG = 'enabled'
54GIR_MESON_DISABLE_FLAG = 'disabled'
55
56PACKAGECONFIG ??= ""
57PACKAGECONFIG[brotli] = "-Dbrotli=enabled,-Dbrotli=disabled,brotli"
58# libsoup-gnome is entirely deprecated and just stubs in 2.42 onwards
59PACKAGECONFIG[gnome] = "-Dgnome=true,-Dgnome=false"
60PACKAGECONFIG[gssapi] = "-Dgssapi=enabled,-Dgssapi=disabled,krb5"
61PACKAGECONFIG[ntlm] = "-Dntlm=enabled,-Dntlm=disabled"
62PACKAGECONFIG[sysprof] = "-Dsysprof=enabled,-Dsysprof=disabled,sysprof"
63
64# Tell libsoup where the target ntlm_auth is installed
65do_write_config:append:class-target() {
66 cat >${WORKDIR}/soup.cross <<EOF
67[binaries]
68ntlm_auth = '${bindir}/ntlm_auth'
69EOF
70}
71EXTRA_OEMESON:append:class-target = " --cross-file ${WORKDIR}/soup.cross"
72
73EXTRA_OEMESON += "-Dvapi=disabled -Dtls_check=false"
74
75GTKDOC_MESON_OPTION = "gtk_doc"
76
77# When built without gnome support, libsoup-2.4 will contain only one shared lib
78# and will therefore become subject to renaming by debian.bbclass. Prevent
79# renaming in order to keep the package name consistent regardless of whether
80# gnome support is enabled or disabled.
81DEBIAN_NOAUTONAME:${PN} = "1"
82
83# glib-networking is needed for SSL, proxies, etc.
84RRECOMMENDS:${PN} = "glib-networking"
85
86BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
new file mode 100644
index 0000000000..2df9a18c68
--- /dev/null
+++ b/meta-oe/recipes-support/libspdm/libspdm/0001-Backport-API-introduced-in-openssl-3.5.0.patch
@@ -0,0 +1,33 @@
1From 92f6c3d8fa26d9019ba27e0c1aa894517ada93b9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 11 Apr 2025 17:47:05 -0700
4Subject: [PATCH] Backport API introduced in openssl 3.5.0
5
6This commit [1] introduced this new API which is used by pem.h from
7openssl and it should be provided by asn1.h which is vendored here so
8it goes out of sync and causes build errors e.g
9
10In file included from ./os_stub/cryptlib_openssl/pk/x509.c:18:
11/usr/include/openssl/pem.h:399:28: error: unknown type name 'OSSL_i2d_of_void_ctx'
12 399 | int PEM_ASN1_write_bio_ctx(OSSL_i2d_of_void_ctx *i2d, void *vctx,
13
14[1] https://github.com/openssl/openssl/commit/35f6e7ea02b599d5aaf220b4720cbadd946d8023
15
16Upstream-Status: Submitted [https://github.com/DMTF/libspdm/pull/3033]
17Signed-off-by: Khem Raj <raj.khem@gmail.com>
18---
19 os_stub/openssllib/openssl_gen/openssl/asn1.h | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/os_stub/openssllib/openssl_gen/openssl/asn1.h b/os_stub/openssllib/openssl_gen/openssl/asn1.h
23index a90152ee..fcfbe42e 100644
24--- a/os_stub/openssllib/openssl_gen/openssl/asn1.h
25+++ b/os_stub/openssllib/openssl_gen/openssl/asn1.h
26@@ -368,6 +368,7 @@ typedef struct ASN1_VALUE_st ASN1_VALUE;
27
28 typedef void *d2i_of_void(void **, const unsigned char **, long);
29 typedef int i2d_of_void(const void *, unsigned char **);
30+typedef int OSSL_i2d_of_void_ctx(const void *, unsigned char **, void *vctx);
31
32 /*-
33 * The following macros and typedefs allow an ASN1_ITEM
diff --git a/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb b/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb
new file mode 100644
index 0000000000..c6bbd1716b
--- /dev/null
+++ b/meta-oe/recipes-support/libspdm/libspdm_3.7.0.bb
@@ -0,0 +1,83 @@
1SUMMARY = "DMTF's Reference Implementation of SPDM"
2DESCRIPTION = "libspdm is a reference implementation of the DMTF’s Security Protocols and \
3Data Models (SPDM). This is used to enable authentication, attestation and key exchange to \
4assist in providing infrastructure security enablement"
5HOMEPAGE = "https://github.com/DMTF/libspdm"
6BUGTRACKER = "https://github.com/DMTF/libspdm/issues"
7LICENSE = "BSD-3-Clause"
8LIC_FILES_CHKSUM = "file://LICENSE.md;md5=8f9b59a81a88da8e812af43728b72dd7"
9
10DEPENDS = "openssl"
11
12SRC_URI = "git://github.com/DMTF/libspdm.git;branch=main;protocol=https \
13 file://0001-Backport-API-introduced-in-openssl-3.5.0.patch"
14SRCREV = "1be116c7b7713fa9003e1bd53b53a34758549eb9"
15
16
17inherit cmake
18
19LIBSPDM_CFLAGS = "\
20 ${OECMAKE_C_FLAGS} \
21 -DLIBSPDM_ENABLE_CAPABILITY_EVENT_CAP=0 \
22 -DLIBSPDM_ENABLE_CAPABILITY_MEL_CAP=0 \
23 -DLIBSPDM_ENABLE_CAPABILITY_GET_KEY_PAIR_INFO_CAP=0 \
24 -DLIBSPDM_ENABLE_CAPABILITY_SET_KEY_PAIR_INFO_CAP=0 \
25 -DLIBSPDM_HAL_PASS_SPDM_CONTEXT=1 \
26 -DLIBSPDM_ENABLE_CAPABILITY_ENDPOINT_INFO_CAP=0 \
27 "
28
29LIBSPDM_CFLAGS:append:toolchain-gcc = " -fPIE"
30
31def get_spdm_multiarch(bb, d):
32 target_arch = d.getVar('TARGET_ARCH')
33 multiarch_options = {
34 "x86_64": "x64",
35 "i586": "ia32",
36 "i686": "ia32",
37 "arm": "arm",
38 "aarch64": "aarch64",
39 "riscv32": "riscv32",
40 "riscv64": "riscv64",
41 "ppc64le": "ppc64le",
42 }
43
44 if target_arch in multiarch_options :
45 return multiarch_options[target_arch]
46
47 bb.error("unsupported architecture '%s'" % target_arch)
48
49EXTRA_OECMAKE += "\
50 -DARCH=${@get_spdm_multiarch(bb, d)} \
51 -DTOOLCHAIN=NONE \
52 -DTARGET=Release \
53 -DCRYPTO=openssl \
54 -DENABLE_BINARY_BUILD=1 \
55 -DCOMPILED_LIBCRYPTO_PATH=${libdir} \
56 -DCOMPILED_LIBSSL_PATH=${libdir} \
57 -DDISABLE_TESTS=1 \
58 -DDISABLE_EDDSA=1 \
59 -DCMAKE_C_FLAGS='${LIBSPDM_CFLAGS}' \
60 "
61
62do_install () {
63 install -d ${D}/${libdir}
64 install -m 0644 lib/* ${D}/${libdir}/
65
66 install -d ${D}/${includedir}/${BPN}/
67 cp -rf ${S}/include/* ${D}/${includedir}/${BPN}/
68
69 install -d ${D}/${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib
70 cp -rf ${S}/os_stub/spdm_crypt_ext_lib/*.h ${D}/${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib/
71}
72
73FILES:${PN} += "${libdir}/*.a"
74FILES:${PN} += "${includedir}/${BPN}/*.h"
75FILES:${PN} += "${includedir}/${BPN}/os_stub/spdm_crypt_ext_lib/*.h"
76
77COMPATIBLE_HOST:powerpc = "null"
78COMPATIBLE_HOST:powerpc64 = "null"
79COMPATIBLE_HOST:mipsarchn32 = "null"
80COMPATIBLE_HOST:mipsarcho32 = "null"
81COMPATIBLE_HOST:mipsarchn64 = "null"
82
83BBCLASSEXTEND = "native nativesdk"
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch
new file mode 100644
index 0000000000..21af9a5a19
--- /dev/null
+++ b/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch
@@ -0,0 +1,37 @@
1From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Sun, 15 Sep 2024 20:31:55 +0800
4Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag
5
6Drop -Wunused-variable flag to fix build with clang:
7
8libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable]
9 29 | GCRY_THREAD_OPTION_PTHREAD_IMPL;
10 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
11libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL'
12 217 | static struct gcry_thread_cbs gcry_threads_pthread = { \
13 | ^~~~~~~~~~~~~~~~~~~~
14
15Upstream-Status: Inappropriate [embedded specific]
16
17Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
18---
19 CompilerChecks.cmake | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake
23index 9719e699..ec15fa2a 100644
24--- a/CompilerChecks.cmake
25+++ b/CompilerChecks.cmake
26@@ -48,7 +48,7 @@ if (UNIX)
27 add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS)
28 add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS)
29 add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS)
30- add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS)
31+ #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS)
32
33 check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT)
34 if (REQUIRED_FLAGS_WFORMAT)
35--
362.25.1
37
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch
deleted file mode 100644
index d2d1fb5955..0000000000
--- a/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2023 21:59:19 -0700
4Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt
5
6This is to match the prototype for callback functions which are now emitted as
7errors by clang16
8
9Fixes
10
11TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:903:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
12 .encrypt = des3_encrypt,
13 ^~~~~~~~~~~~
14TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/libssh/0.10.4-r0/git/src/libgcrypt.c:904:20: error: incompatible function pointer types initializing 'void (*)(struct ssh_cipher_struct *, void *, void *, size_t)' (aka 'void (*)(struct ssh_cipher_struct *, void *, void *, unsigned int)') with an expression of type 'void (struct ssh_cipher_struct *, void *, void *, unsigned long)' [-Wincompatible-function-pointer-types]
15 .decrypt = des3_decrypt
16 ^~~~~~~~~~~~
17
18Upstream-Status: Pending
19
20Signed-off-by: Khem Raj <raj.khem@gmail.com>
21
22---
23 src/libgcrypt.c | 4 ++--
24 1 file changed, 2 insertions(+), 2 deletions(-)
25
26diff --git a/src/libgcrypt.c b/src/libgcrypt.c
27index f410d997..e3f66781 100644
28--- a/src/libgcrypt.c
29+++ b/src/libgcrypt.c
30@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) {
31 }
32
33 static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in,
34- void *out, unsigned long len) {
35+ void *out, size_t len) {
36 gcry_cipher_encrypt(cipher->key[0], out, len, in, len);
37 }
38
39 static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in,
40- void *out, unsigned long len) {
41+ void *out, size_t len) {
42 gcry_cipher_decrypt(cipher->key[0], out, len, in, len);
43 }
44
diff --git a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
index d6bc75c3a6..4803ff81d8 100644
--- a/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
+++ b/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch
@@ -1,4 +1,4 @@
1From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 1From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001
2From: Yi Zhao <yi.zhao@windriver.com> 2From: Yi Zhao <yi.zhao@windriver.com>
3Date: Wed, 15 Mar 2023 16:51:58 +0800 3Date: Wed, 15 Mar 2023 16:51:58 +0800
4Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host 4Subject: [PATCH] tests/CMakeLists.txt: do not search ssh/sshd commands on host
@@ -9,16 +9,15 @@ not required by unittests, we can skip the search.
9Upstream-Status: Inappropriate [embedded specific] 9Upstream-Status: Inappropriate [embedded specific]
10 10
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12
13--- 12---
14 tests/CMakeLists.txt | 2 ++ 13 tests/CMakeLists.txt | 2 ++
15 1 file changed, 2 insertions(+) 14 1 file changed, 2 insertions(+)
16 15
17diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt 16diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
18index f5c30061..885c926a 100644 17index 89b95d08..e481534c 100644
19--- a/tests/CMakeLists.txt 18--- a/tests/CMakeLists.txt
20+++ b/tests/CMakeLists.txt 19+++ b/tests/CMakeLists.txt
21@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES 20@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES
22 21
23 add_subdirectory(unittests) 22 add_subdirectory(unittests)
24 23
@@ -26,11 +25,14 @@ index f5c30061..885c926a 100644
26 # OpenSSH Capabilities are required for all unit tests 25 # OpenSSH Capabilities are required for all unit tests
27 find_program(SSH_EXECUTABLE NAMES ssh) 26 find_program(SSH_EXECUTABLE NAMES ssh)
28 if (SSH_EXECUTABLE) 27 if (SSH_EXECUTABLE)
29@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) 28@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI)
29 file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE)
30 30
31 message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") 31 message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}")
32 endif ()
33+endif () 32+endif ()
34 33
35 configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) 34 configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h)
36 35
36--
372.25.1
38
diff --git a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb
index 31f29c1b7d..bb2b0dc466 100644
--- a/meta-oe/recipes-support/libssh/libssh_0.10.6.bb
+++ b/meta-oe/recipes-support/libssh/libssh_0.11.1.bb
@@ -6,14 +6,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0"
6 6
7DEPENDS = "zlib openssl" 7DEPENDS = "zlib openssl"
8 8
9SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ 9SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \
10 file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ 10 file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \
11 file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \
12 file://run-ptest \ 11 file://run-ptest \
13 " 12 "
14SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6"
15 13
16S = "${WORKDIR}/git" 14SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch"
15
16SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73"
17
17 18
18inherit cmake ptest 19inherit cmake ptest
19 20
diff --git a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
index be2935a385..d462d3018f 100644
--- a/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
+++ b/meta-oe/recipes-support/libstemmer/libstemmer_2.2.0.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/snowballstem/snowball.git;branch=master;protocol=htt
9 file://0001-Build-so-lib.patch \ 9 file://0001-Build-so-lib.patch \
10 " 10 "
11SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b" 11SRCREV = "48a67a2831005f49c48ec29a5837640e23e54e6b"
12S = "${WORKDIR}/git"
13 12
14LIBVER = "0.0.0" 13LIBVER = "0.0.0"
15 14
diff --git a/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
new file mode 100644
index 0000000000..f0fd2a4aa1
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch
@@ -0,0 +1,53 @@
1From 9426ac3d232e2f90c571979a2166c5e1328967d1 Mon Sep 17 00:00:00 2001
2From: Hans de Goede <j.w.r.degoede@hhs.nl>
3Date: Tue, 15 Oct 2013 14:39:04 +0200
4Subject: [PATCH] Fix missing prototype compiler warnings
5
6Signed-off-by: Kamil Dudka <kdudka@redhat.com>
7
8Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/30e5556d1c9323e9f1887b28d42581c2954b53c9]
9
10Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
11---
12 lib/append.c | 2 ++
13 lib/output.c | 1 +
14 lib/wrapper.c | 1 +
15 3 files changed, 4 insertions(+)
16
17diff --git a/lib/append.c b/lib/append.c
18index 13e1ace..e8bd89d 100644
19--- a/lib/append.c
20+++ b/lib/append.c
21@@ -13,6 +13,8 @@
22 #include <internal.h>
23
24 #include <stdio.h>
25+#include <stdlib.h>
26+#include <string.h>
27 #include <errno.h>
28 #include <fcntl.h>
29 #include <sys/param.h>
30diff --git a/lib/output.c b/lib/output.c
31index a2db929..a5262ee 100644
32--- a/lib/output.c
33+++ b/lib/output.c
34@@ -13,6 +13,7 @@
35 #include <internal.h>
36
37 #include <stdio.h>
38+#include <stdlib.h>
39 #include <pwd.h>
40 #include <grp.h>
41 #include <time.h>
42diff --git a/lib/wrapper.c b/lib/wrapper.c
43index 4cd0652..44cc435 100644
44--- a/lib/wrapper.c
45+++ b/lib/wrapper.c
46@@ -13,6 +13,7 @@
47 #include <internal.h>
48
49 #include <stdio.h>
50+#include <stdlib.h>
51 #include <sys/param.h>
52 #include <dirent.h>
53 #include <errno.h>
diff --git a/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
new file mode 100644
index 0000000000..b1ecb552bc
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch
@@ -0,0 +1,44 @@
1From c0a89709860acae5ef67727db7b23db385703bf6 Mon Sep 17 00:00:00 2001
2From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
3Date: Tue, 15 Oct 2013 14:39:05 +0200
4Subject: [PATCH] Fix invalid memory de-reference issue
5
6Bug: https://bugzilla.redhat.com/551415
7
8Signed-off-by: Kamil Dudka <kdudka@redhat.com>
9
10Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/560911b694055b0c677431cf85d4d0d5ebd1a3fd]
11
12Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
13---
14 lib/libtar.h | 1 +
15 lib/util.c | 4 +---
16 2 files changed, 2 insertions(+), 3 deletions(-)
17
18diff --git a/lib/libtar.h b/lib/libtar.h
19index 55f509a..7fc4d03 100644
20--- a/lib/libtar.h
21+++ b/lib/libtar.h
22@@ -172,6 +172,7 @@ int th_write(TAR *t);
23 #define TH_ISDIR(t) ((t)->th_buf.typeflag == DIRTYPE \
24 || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \
25 || ((t)->th_buf.typeflag == AREGTYPE \
26+ && strlen((t)->th_buf.name) \
27 && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/')))
28 #define TH_ISFIFO(t) ((t)->th_buf.typeflag == FIFOTYPE \
29 || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode)))
30diff --git a/lib/util.c b/lib/util.c
31index 31e8315..11438ef 100644
32--- a/lib/util.c
33+++ b/lib/util.c
34@@ -148,9 +148,7 @@ oct_to_int(char *oct)
35 {
36 int i;
37
38- sscanf(oct, "%o", &i);
39-
40- return i;
41+ return sscanf(oct, "%o", &i) == 1 ? i : 0;
42 }
43
44
diff --git a/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
new file mode 100644
index 0000000000..627c270163
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch
@@ -0,0 +1,101 @@
1From d998b9f75c79aab68255dace641dd30db239eff6 Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Tue, 15 Oct 2013 19:48:41 -0400
4Subject: [PATCH] fix file descriptor leaks reported by cppcheck
5
6Bug: https://bugzilla.redhat.com/785760
7
8Authored by Kamil Dudka <kdudka@redhat.com>.
9
10Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/abd0274e6b2f708e9eaa29414b07b3f542cec694]
11
12Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
13---
14 lib/append.c | 14 +++++++++-----
15 lib/extract.c | 4 ++++
16 libtar/libtar.c | 3 +++
17 3 files changed, 16 insertions(+), 5 deletions(-)
18
19diff --git a/lib/append.c b/lib/append.c
20index e8bd89d..ff58532 100644
21--- a/lib/append.c
22+++ b/lib/append.c
23@@ -216,6 +216,7 @@ tar_append_regfile(TAR *t, const char *realname)
24 int filefd;
25 int i, j;
26 size_t size;
27+ int rv = -1;
28
29 filefd = open(realname, O_RDONLY);
30 if (filefd == -1)
31@@ -234,25 +235,28 @@ tar_append_regfile(TAR *t, const char *realname)
32 {
33 if (j != -1)
34 errno = EINVAL;
35- return -1;
36+ goto fail;
37 }
38 if (tar_block_write(t, &block) == -1)
39- return -1;
40+ goto fail;
41 }
42
43 if (i > 0)
44 {
45 j = read(filefd, &block, i);
46 if (j == -1)
47- return -1;
48+ goto fail;
49 memset(&(block[i]), 0, T_BLOCKSIZE - i);
50 if (tar_block_write(t, &block) == -1)
51- return -1;
52+ goto fail;
53 }
54
55+ /* success! */
56+ rv = 0;
57+fail:
58 close(filefd);
59
60- return 0;
61+ return rv;
62 }
63
64
65diff --git a/lib/extract.c b/lib/extract.c
66index 36357e7..9fc6ad5 100644
67--- a/lib/extract.c
68+++ b/lib/extract.c
69@@ -228,13 +228,17 @@ tar_extract_regfile(TAR *t, char *realname)
70 {
71 if (k != -1)
72 errno = EINVAL;
73+ close(fdout);
74 return -1;
75 }
76
77 /* write block to output file */
78 if (write(fdout, buf,
79 ((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1)
80+ {
81+ close(fdout);
82 return -1;
83+ }
84 }
85
86 /* close output file */
87diff --git a/libtar/libtar.c b/libtar/libtar.c
88index 9fa92b2..bb5644c 100644
89--- a/libtar/libtar.c
90+++ b/libtar/libtar.c
91@@ -83,7 +83,10 @@ gzopen_frontend(char *pathname, int oflags, int mode)
92 return -1;
93
94 if ((oflags & O_CREAT) && fchmod(fd, mode))
95+ {
96+ close(fd);
97 return -1;
98+ }
99
100 gzf = gzdopen(fd, gzoflags);
101 if (!gzf)
diff --git a/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
new file mode 100644
index 0000000000..90809ad846
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch
@@ -0,0 +1,26 @@
1From f6c5cba59444ecda9bbc22b8e8e57fd1015a688d Mon Sep 17 00:00:00 2001
2From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
3Date: Tue, 15 Oct 2013 20:02:58 -0400
4Subject: [PATCH] fix memleak on tar_open() failure
5
6Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
7
8Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/36629a41208375f5105427e98078127551692028]
9
10Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
11---
12 lib/handle.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/lib/handle.c b/lib/handle.c
16index 33a262c..002d23c 100644
17--- a/lib/handle.c
18+++ b/lib/handle.c
19@@ -82,6 +82,7 @@ tar_open(TAR **t, const char *pathname, tartype_t *type,
20 (*t)->fd = (*((*t)->type->openfunc))(pathname, oflags, mode);
21 if ((*t)->fd == -1)
22 {
23+ libtar_hash_free((*t)->h, NULL);
24 free(*t);
25 return -1;
26 }
diff --git a/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
new file mode 100644
index 0000000000..f88bcbf9cf
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch
@@ -0,0 +1,119 @@
1From e3888e452aee72e0d658185ac20e8e63bed1aff8 Mon Sep 17 00:00:00 2001
2From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>
3Date: Tue, 15 Oct 2013 20:05:04 -0400
4Subject: [PATCH] fix memleaks in libtar sample program
5
6Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>.
7
8Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/f3c711cf3054ff366a1a3500cdc8c64ecc2d2da6]
9
10Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
11---
12 libtar/libtar.c | 29 ++++++++++++++++++-----------
13 1 file changed, 18 insertions(+), 11 deletions(-)
14
15diff --git a/libtar/libtar.c b/libtar/libtar.c
16index bb5644c..23f8741 100644
17--- a/libtar/libtar.c
18+++ b/libtar/libtar.c
19@@ -253,6 +253,7 @@ extract(char *tarfile, char *rootdir)
20 if (tar_extract_all(t, rootdir) != 0)
21 {
22 fprintf(stderr, "tar_extract_all(): %s\n", strerror(errno));
23+ tar_close(t);
24 return -1;
25 }
26
27@@ -270,12 +271,13 @@ extract(char *tarfile, char *rootdir)
28
29
30 void
31-usage()
32+usage(void *rootdir)
33 {
34 printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n",
35 progname);
36 printf(" %s [-C rootdir] [-g] [-z] -c filename.tar ...\n",
37 progname);
38+ free(rootdir);
39 exit(-1);
40 }
41
42@@ -292,6 +294,7 @@ main(int argc, char *argv[])
43 int c;
44 int mode = 0;
45 libtar_list_t *l;
46+ int return_code = -2;
47
48 progname = basename(argv[0]);
49
50@@ -313,17 +316,17 @@ main(int argc, char *argv[])
51 break;
52 case 'c':
53 if (mode)
54- usage();
55+ usage(rootdir);
56 mode = MODE_CREATE;
57 break;
58 case 'x':
59 if (mode)
60- usage();
61+ usage(rootdir);
62 mode = MODE_EXTRACT;
63 break;
64 case 't':
65 if (mode)
66- usage();
67+ usage(rootdir);
68 mode = MODE_LIST;
69 break;
70 #ifdef HAVE_LIBZ
71@@ -332,7 +335,7 @@ main(int argc, char *argv[])
72 break;
73 #endif /* HAVE_LIBZ */
74 default:
75- usage();
76+ usage(rootdir);
77 }
78
79 if (!mode || ((argc - optind) < (mode == MODE_CREATE ? 2 : 1)))
80@@ -341,7 +344,7 @@ main(int argc, char *argv[])
81 printf("argc - optind == %d\tmode == %d\n", argc - optind,
82 mode);
83 #endif
84- usage();
85+ usage(rootdir);
86 }
87
88 #ifdef DEBUG
89@@ -351,21 +354,25 @@ main(int argc, char *argv[])
90 switch (mode)
91 {
92 case MODE_EXTRACT:
93- return extract(argv[optind], rootdir);
94+ return_code = extract(argv[optind], rootdir);
95+ break;
96 case MODE_CREATE:
97 tarfile = argv[optind];
98 l = libtar_list_new(LIST_QUEUE, NULL);
99 for (c = optind + 1; c < argc; c++)
100 libtar_list_add(l, argv[c]);
101- return create(tarfile, rootdir, l);
102+ return_code = create(tarfile, rootdir, l);
103+ libtar_list_free(l, NULL);
104+ break;
105 case MODE_LIST:
106- return list(argv[optind]);
107+ return_code = list(argv[optind]);
108+ break;
109 default:
110 break;
111 }
112
113- /* NOTREACHED */
114- return -2;
115+ free(rootdir);
116+ return return_code;
117 }
118
119
diff --git a/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
new file mode 100644
index 0000000000..beba45405e
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch
@@ -0,0 +1,89 @@
1From edbee9832475347183a841a8fd5be71f74e10392 Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Wed, 23 Oct 2013 15:04:22 +0200
4Subject: [PATCH] decode: avoid using a static buffer in th_get_pathname()
5
6A solution suggested by Chris Frey:
7https://lists.feep.net:8080/pipermail/libtar/2013-October/000377.html
8
9Note this can break programs that expect sizeof(TAR) to be fixed.
10
11Authored by Kamil Dudka <kdudka@redhat.com>.
12
13Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/ec613af2e9371d7a3e1f7c7a6822164a4255b4d1]
14
15Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
16---
17 lib/decode.c | 24 +++++++++++++++++-------
18 lib/handle.c | 1 +
19 lib/libtar.h | 3 +++
20 3 files changed, 21 insertions(+), 7 deletions(-)
21
22diff --git a/lib/decode.c b/lib/decode.c
23index c16ea2d..edb2185 100644
24--- a/lib/decode.c
25+++ b/lib/decode.c
26@@ -26,20 +26,30 @@
27 char *
28 th_get_pathname(TAR *t)
29 {
30- static TLS_THREAD char filename[MAXPATHLEN];
31-
32 if (t->th_buf.gnu_longname)
33 return t->th_buf.gnu_longname;
34
35- if (t->th_buf.prefix[0] != '\0')
36+ /* allocate the th_pathname buffer if not already */
37+ if (t->th_pathname == NULL)
38+ {
39+ t->th_pathname = malloc(MAXPATHLEN * sizeof(char));
40+ if (t->th_pathname == NULL)
41+ /* out of memory */
42+ return NULL;
43+ }
44+
45+ if (t->th_buf.prefix[0] == '\0')
46+ {
47+ snprintf(t->th_pathname, MAXPATHLEN, "%.100s", t->th_buf.name);
48+ }
49+ else
50 {
51- snprintf(filename, sizeof(filename), "%.155s/%.100s",
52+ snprintf(t->th_pathname, MAXPATHLEN, "%.155s/%.100s",
53 t->th_buf.prefix, t->th_buf.name);
54- return filename;
55 }
56
57- snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name);
58- return filename;
59+ /* will be deallocated in tar_close() */
60+ return t->th_pathname;
61 }
62
63
64diff --git a/lib/handle.c b/lib/handle.c
65index 002d23c..a19c046 100644
66--- a/lib/handle.c
67+++ b/lib/handle.c
68@@ -122,6 +122,7 @@ tar_close(TAR *t)
69 libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
70 ? free
71 : (libtar_freefunc_t)tar_dev_free));
72+ free(t->th_pathname);
73 free(t);
74
75 return i;
76diff --git a/lib/libtar.h b/lib/libtar.h
77index 7fc4d03..08a8e0f 100644
78--- a/lib/libtar.h
79+++ b/lib/libtar.h
80@@ -85,6 +85,9 @@ typedef struct
81 int options;
82 struct tar_header th_buf;
83 libtar_hash_t *h;
84+
85+ /* introduced in libtar 1.2.21 */
86+ char *th_pathname;
87 }
88 TAR;
89
diff --git a/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
new file mode 100644
index 0000000000..2d8f21171b
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch
@@ -0,0 +1,30 @@
1From bc8ec7d940d7ffc870638521bd134098d2efa5df Mon Sep 17 00:00:00 2001
2From: Chris Frey <cdfrey@foursquare.net>
3Date: Thu, 24 Oct 2013 17:55:12 -0400
4Subject: [PATCH] Check for NULL before freeing th_pathname
5
6Thanks to Harald Koch for pointing out that AIX 4 and 5 still need this.
7
8Authored by Chris Frey <cdfrey@foursquare.net>.
9
10Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/495d0c0eabc5648186e7d58ad54b508d14af38f4]
11
12Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
13---
14 lib/handle.c | 3 ++-
15 1 file changed, 2 insertions(+), 1 deletion(-)
16
17diff --git a/lib/handle.c b/lib/handle.c
18index a19c046..28a7dc2 100644
19--- a/lib/handle.c
20+++ b/lib/handle.c
21@@ -122,7 +122,8 @@ tar_close(TAR *t)
22 libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
23 ? free
24 : (libtar_freefunc_t)tar_dev_free));
25- free(t->th_pathname);
26+ if (t->th_pathname != NULL)
27+ free(t->th_pathname);
28 free(t);
29
30 return i;
diff --git a/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
new file mode 100644
index 0000000000..edbd636b23
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch
@@ -0,0 +1,26 @@
1From c64dfdc6ec5bc752aafd1ac16a380f47602197c4 Mon Sep 17 00:00:00 2001
2From: Chris Frey <cdfrey@foursquare.net>
3Date: Thu, 24 Oct 2013 17:58:47 -0400
4Subject: [PATCH] Added stdlib.h for malloc() in lib/decode.c
5
6Authored by Chris Frey <cdfrey@foursquare.net>.
7
8Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/20aa09bd7775094a2beb0f136c2c7d9e9fd6c7e6]
9
10Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
11---
12 lib/decode.c | 1 +
13 1 file changed, 1 insertion(+)
14
15diff --git a/lib/decode.c b/lib/decode.c
16index edb2185..35312be 100644
17--- a/lib/decode.c
18+++ b/lib/decode.c
19@@ -13,6 +13,7 @@
20 #include <internal.h>
21
22 #include <stdio.h>
23+#include <stdlib.h>
24 #include <sys/param.h>
25 #include <pwd.h>
26 #include <grp.h>
diff --git a/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
new file mode 100644
index 0000000000..7b39df4254
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch
@@ -0,0 +1,100 @@
1From b469d621c0143e652c51bb238fd2060135aa2009 Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Tue, 6 Nov 2018 17:24:05 +0100
4Subject: [PATCH] libtar: fix programming mistakes detected by static analysis
5
6Authored by Kamil Dudka <kdudka@redhat.com>.
7
8meta-openembedded uses Debian's release tarball [1]. Debian uses
9repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
10been inactive since 2013 [3].
11
12Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
13
14[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
15[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
16[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
17
18Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
19---
20 lib/append.c | 7 +++++++
21 lib/wrapper.c | 11 +++++++----
22 libtar/libtar.c | 1 +
23 3 files changed, 15 insertions(+), 4 deletions(-)
24
25diff --git a/lib/append.c b/lib/append.c
26index ff58532..6386a50 100644
27--- a/lib/append.c
28+++ b/lib/append.c
29@@ -110,9 +110,16 @@ tar_append_file(TAR *t, const char *realname, const char *savename)
30 td->td_dev = s.st_dev;
31 td->td_h = libtar_hash_new(256, (libtar_hashfunc_t)ino_hash);
32 if (td->td_h == NULL)
33+ {
34+ free(td);
35 return -1;
36+ }
37 if (libtar_hash_add(t->h, td) == -1)
38+ {
39+ libtar_hash_free(td->td_h, free);
40+ free(td);
41 return -1;
42+ }
43 }
44 libtar_hashptr_reset(&hp);
45 if (libtar_hash_getkey(td->td_h, &hp, &(s.st_ino),
46diff --git a/lib/wrapper.c b/lib/wrapper.c
47index 44cc435..2d3f5b9 100644
48--- a/lib/wrapper.c
49+++ b/lib/wrapper.c
50@@ -97,6 +97,7 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
51 struct dirent *dent;
52 DIR *dp;
53 struct stat s;
54+ int ret = -1;
55
56 #ifdef DEBUG
57 printf("==> tar_append_tree(0x%lx, \"%s\", \"%s\")\n",
58@@ -130,24 +131,26 @@ tar_append_tree(TAR *t, char *realdir, char *savedir)
59 dent->d_name);
60
61 if (lstat(realpath, &s) != 0)
62- return -1;
63+ goto fail;
64
65 if (S_ISDIR(s.st_mode))
66 {
67 if (tar_append_tree(t, realpath,
68 (savedir ? savepath : NULL)) != 0)
69- return -1;
70+ goto fail;
71 continue;
72 }
73
74 if (tar_append_file(t, realpath,
75 (savedir ? savepath : NULL)) != 0)
76- return -1;
77+ goto fail;
78 }
79
80+ ret = 0;
81+fail:
82 closedir(dp);
83
84- return 0;
85+ return ret;
86 }
87
88
89diff --git a/libtar/libtar.c b/libtar/libtar.c
90index 23f8741..ac339e7 100644
91--- a/libtar/libtar.c
92+++ b/libtar/libtar.c
93@@ -92,6 +92,7 @@ gzopen_frontend(char *pathname, int oflags, int mode)
94 if (!gzf)
95 {
96 errno = ENOMEM;
97+ close(fd);
98 return -1;
99 }
100
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
new file mode 100644
index 0000000000..93b35cbcd3
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch
@@ -0,0 +1,160 @@
1From 2c81f47508fa6bce9df84e3b43dfb16dffb742a0 Mon Sep 17 00:00:00 2001
2From: Raphael Geissert <geissert@debian.org>
3Date: Thu, 12 Sep 2024 15:51:05 +0300
4Subject: [PATCH] Avoid directory traversal when extracting archives
5
6Description of the vulnerability from the NIST CVE tracker [1]:
7
8 Multiple directory traversal vulnerabilities in the (1)
9 tar_extract_glob and (2) tar_extract_all functions in libtar 1.2.20
10 and earlier allow remote attackers to overwrite arbitrary files via
11 a .. (dot dot) in a crafted tar file.
12
13Imported from the Debian libtar package 1.2.20-8 [2]. Original Debian
14description:
15
16 Author: Raphael Geissert <geissert@debian.org>
17 Bug-Debian: https://bugs.debian.org/731860
18 Description: Avoid directory traversal when extracting archives
19 by skipping over leading slashes and any prefix containing ".." components.
20 Forwarded: yes
21
22meta-openembedded uses Debian's release tarball [3]. Debian uses
23repo.or.cz/libtar.git as their upstream [4]. repo.or.cz/libtar.git has
24been inactive since 2013 [5].
25
26CVE: CVE-2013-4420
27
28Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
29
30Comments: Added the commit message
31
32[1] https://nvd.nist.gov/vuln/detail/CVE-2013-4420
33[2] https://sources.debian.org/patches/libtar/1.2.20-8/CVE-2013-4420.patch/
34[3] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
35[4] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
36[5] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
37
38Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
39---
40 lib/decode.c | 33 +++++++++++++++++++++++++++++++--
41 lib/extract.c | 8 ++++----
42 lib/internal.h | 1 +
43 lib/output.c | 4 ++--
44 4 files changed, 38 insertions(+), 8 deletions(-)
45
46diff --git a/lib/decode.c b/lib/decode.c
47index 35312be..edd5f2e 100644
48--- a/lib/decode.c
49+++ b/lib/decode.c
50@@ -22,13 +22,42 @@
51 # include <string.h>
52 #endif
53
54+char *
55+safer_name_suffix (char const *file_name)
56+{
57+ char const *p, *t;
58+ p = t = file_name;
59+ while (*p == '/') t = ++p;
60+ while (*p)
61+ {
62+ while (p[0] == '.' && p[0] == p[1] && p[2] == '/')
63+ {
64+ p += 3;
65+ t = p;
66+ }
67+ /* advance pointer past the next slash */
68+ while (*p && (p++)[0] != '/');
69+ }
70+
71+ if (!*t)
72+ {
73+ t = ".";
74+ }
75+
76+ if (t != file_name)
77+ {
78+ /* TODO: warn somehow that the path was modified */
79+ }
80+ return (char*)t;
81+}
82+
83
84 /* determine full path name */
85 char *
86 th_get_pathname(TAR *t)
87 {
88 if (t->th_buf.gnu_longname)
89- return t->th_buf.gnu_longname;
90+ return safer_name_suffix(t->th_buf.gnu_longname);
91
92 /* allocate the th_pathname buffer if not already */
93 if (t->th_pathname == NULL)
94@@ -50,7 +79,7 @@ th_get_pathname(TAR *t)
95 }
96
97 /* will be deallocated in tar_close() */
98- return t->th_pathname;
99+ return safer_name_suffix(t->th_pathname);
100 }
101
102
103diff --git a/lib/extract.c b/lib/extract.c
104index 9fc6ad5..4ff1a95 100644
105--- a/lib/extract.c
106+++ b/lib/extract.c
107@@ -302,14 +302,14 @@ tar_extract_hardlink(TAR * t, char *realname)
108 if (mkdirhier(dirname(filename)) == -1)
109 return -1;
110 libtar_hashptr_reset(&hp);
111- if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t),
112+ if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)),
113 (libtar_matchfunc_t)libtar_str_match) != 0)
114 {
115 lnp = (char *)libtar_hashptr_data(&hp);
116 linktgt = &lnp[strlen(lnp) + 1];
117 }
118 else
119- linktgt = th_get_linkname(t);
120+ linktgt = safer_name_suffix(th_get_linkname(t));
121
122 #ifdef DEBUG
123 printf(" ==> extracting: %s (link to %s)\n", filename, linktgt);
124@@ -347,9 +347,9 @@ tar_extract_symlink(TAR *t, char *realname)
125
126 #ifdef DEBUG
127 printf(" ==> extracting: %s (symlink to %s)\n",
128- filename, th_get_linkname(t));
129+ filename, safer_name_suffix(th_get_linkname(t)));
130 #endif
131- if (symlink(th_get_linkname(t), filename) == -1)
132+ if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1)
133 {
134 #ifdef DEBUG
135 perror("symlink()");
136diff --git a/lib/internal.h b/lib/internal.h
137index da7be7f..f05ca4f 100644
138--- a/lib/internal.h
139+++ b/lib/internal.h
140@@ -21,3 +21,4 @@
141 #define TLS_THREAD
142 #endif
143
144+char* safer_name_suffix(char const*);
145diff --git a/lib/output.c b/lib/output.c
146index a5262ee..af754f1 100644
147--- a/lib/output.c
148+++ b/lib/output.c
149@@ -124,9 +124,9 @@ th_print_long_ls(TAR *t)
150 else
151 printf(" link to ");
152 if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL)
153- printf("%s", t->th_buf.gnu_longlink);
154+ printf("%s", safer_name_suffix(t->th_buf.gnu_longlink));
155 else
156- printf("%.100s", t->th_buf.linkname);
157+ printf("%.100s", safer_name_suffix(t->th_buf.linkname));
158 }
159
160 putchar('\n');
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
new file mode 100644
index 0000000000..0a2773fae2
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch
@@ -0,0 +1,42 @@
1From e590423f62cf5bc922ff4a1f7eab9bf7d65ee472 Mon Sep 17 00:00:00 2001
2From: Kamil Dudka <kdudka@redhat.com>
3Date: Tue, 4 Oct 2022 10:39:35 +0200
4Subject: [PATCH] free memory allocated by gnu_long* fields
5
6Authored by Kamil Dudka <kdudka@redhat.com>.
7
8meta-openembedded uses Debian's release tarball [1]. Debian uses
9repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
10been inactive since 2013 [3].
11
12CVE: CVE-2021-33640 CVE-2021-33645 CVE-2021-33646
13
14Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
15
16[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
17[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
18[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
19
20Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
21---
22 lib/handle.c | 7 +++++--
23 1 file changed, 5 insertions(+), 2 deletions(-)
24
25diff --git a/lib/handle.c b/lib/handle.c
26index 28a7dc2..18bd8dc 100644
27--- a/lib/handle.c
28+++ b/lib/handle.c
29@@ -122,8 +122,11 @@ tar_close(TAR *t)
30 libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY
31 ? free
32 : (libtar_freefunc_t)tar_dev_free));
33- if (t->th_pathname != NULL)
34- free(t->th_pathname);
35+
36+ free(t->th_pathname);
37+ free(t->th_buf.gnu_longname);
38+ free(t->th_buf.gnu_longlink);
39+
40 free(t);
41
42 return i;
diff --git a/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
new file mode 100644
index 0000000000..a61cc3b6a9
--- /dev/null
+++ b/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch
@@ -0,0 +1,52 @@
1From c778d234c396e78bacef7c9bff0dd2bb9fb6aac8 Mon Sep 17 00:00:00 2001
2From: shixuantong <1726671442@qq.com>
3Date: Wed, 6 Apr 2022 17:40:57 +0800
4Subject: [PATCH] Ensure that sz is greater than 0.
5
6Authored by shixuantong <1726671442@qq.com>.
7
8meta-openembedded uses Debian's release tarball [1]. Debian uses
9repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has
10been inactive since 2013 [3].
11
12CVE: CVE-2021-33643 CVE-2021-33644
13
14Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013]
15
16[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8
17[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged)
18[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master
19
20Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com>
21---
22 lib/block.c | 10 ++++++++++
23 1 file changed, 10 insertions(+)
24
25diff --git a/lib/block.c b/lib/block.c
26index 092bc28..f12c4bc 100644
27--- a/lib/block.c
28+++ b/lib/block.c
29@@ -118,6 +118,11 @@ th_read(TAR *t)
30 if (TH_ISLONGLINK(t))
31 {
32 sz = th_get_size(t);
33+ if ((int)sz <= 0)
34+ {
35+ errno = EINVAL;
36+ return -1;
37+ }
38 blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
39 if (blocks > ((size_t)-1 / T_BLOCKSIZE))
40 {
41@@ -168,6 +173,11 @@ th_read(TAR *t)
42 if (TH_ISLONGNAME(t))
43 {
44 sz = th_get_size(t);
45+ if ((int)sz <= 0)
46+ {
47+ errno = EINVAL;
48+ return -1;
49+ }
50 blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0);
51 if (blocks > ((size_t)-1 / T_BLOCKSIZE))
52 {
diff --git a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
index f93d9c09a5..a17509d2e5 100644
--- a/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
+++ b/meta-oe/recipes-support/libtar/libtar_1.2.20.bb
@@ -8,11 +8,22 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=61cbac6719ae682ce6cd45b5c11e21af"
8SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \ 8SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \
9 file://fix_libtool_sysroot.patch \ 9 file://fix_libtool_sysroot.patch \
10 file://0002-Do-not-strip-libtar.patch \ 10 file://0002-Do-not-strip-libtar.patch \
11 file://0003-Fix-missing-prototype-compiler-warnings.patch \
12 file://0004-Fix-invalid-memory-de-reference-issue.patch \
13 file://0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch \
14 file://0006-fix-memleak-on-tar_open-failure.patch \
15 file://0007-fix-memleaks-in-libtar-sample-program.patch \
16 file://0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch \
17 file://0009-Check-for-NULL-before-freeing-th_pathname.patch \
18 file://0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch \
19 file://0011-libtar-fix-programming-mistakes-detected-by-static-a.patch \
20 file://CVE-2021-33643-CVE-2021-33644.patch \
21 file://CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch \
22 file://CVE-2013-4420.patch \
11 " 23 "
12 24
13S = "${WORKDIR}/${BPN}" 25S = "${UNPACKDIR}/${BPN}"
14 26
15SRC_URI[md5sum] = "6ced95ab3a4b33fbfe2dfb231d156cdb"
16SRC_URI[sha256sum] = "50f24c857a7ef1cb092e6508758b86d06f1188508f897f3e6b40c573e8879109" 27SRC_URI[sha256sum] = "50f24c857a7ef1cb092e6508758b86d06f1188508f897f3e6b40c573e8879109"
17 28
18inherit autotools-brokensep 29inherit autotools-brokensep
diff --git a/meta-oe/recipes-support/libteam/libteam_1.32.bb b/meta-oe/recipes-support/libteam/libteam_1.32.bb
index 508cbb13bb..4686f4be5c 100644
--- a/meta-oe/recipes-support/libteam/libteam_1.32.bb
+++ b/meta-oe/recipes-support/libteam/libteam_1.32.bb
@@ -17,7 +17,6 @@ SRC_URI = "git://github.com/jpirko/libteam;branch=master;protocol=https \
17 " 17 "
18SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1" 18SRCREV = "8b843e93cee1dab61fb79b01791201cdad45e1d1"
19 19
20S = "${WORKDIR}/git"
21 20
22inherit autotools pkgconfig ptest 21inherit autotools pkgconfig ptest
23 22
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch
new file mode 100644
index 0000000000..8fc623744c
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2021-42260.patch
@@ -0,0 +1,27 @@
1Description: In stamp always advance the pointer if *p= 0xef
2 .
3 The current implementation only advanced if 0xef is followed
4 by two non-zero bytes. In case of malformed input (0xef should be
5 the start byte of a three byte character) this leads to an infinite
6 loop. (CVE-2021-42260)
7Origin: https://sourceforge.net/p/tinyxml/git/merge-requests/1/
8
9CVE: CVE-2021-42260
10Upstream-Status: Inactive-Upstream [lastrelease: 2011]
11Signed-off-by: Peter Marko <peter.marko@siemens.com>
12
13--- a/tinyxmlparser.cpp
14+++ b/tinyxmlparser.cpp
15@@ -274,6 +274,12 @@ void TiXmlParsingData::Stamp( const char* now, TiXmlEncoding encoding )
16 else
17 { p +=3; ++col; } // A normal character.
18 }
19+ else
20+ {
21+ // TIXML_UTF_LEAD_0 (239) is the start character of a 3 byte sequence, so
22+ // there is something wrong here. Just advance the pointer to evade infinite loops
23+ ++p;
24+ }
25 }
26 else
27 {
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch
new file mode 100644
index 0000000000..a94806daad
--- /dev/null
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml/CVE-2023-34194.patch
@@ -0,0 +1,31 @@
1From: Guilhem Moulin <guilhem@debian.org>
2Date: Sat, 30 Dec 2023 14:15:54 +0100
3Subject: Avoid reachable assertion via crafted XML document with a '\0'
4 located after whitespace
5
6Bug: https://www.forescout.com/resources/sierra21-vulnerabilities
7Bug-Debian: https://bugs.debian.org/1059315
8Bug-Debian: https://security-tracker.debian.org/tracker/CVE-2023-34194
9
10CVE: CVE-2023-34194
11Upstream-Status: Inactive-Upstream [lastrelease: 2011]
12Signed-off-by: Peter Marko <peter.marko@siemens.com>
13---
14 tinyxmlparser.cpp | 4 ++++
15 1 file changed, 4 insertions(+)
16
17diff --git a/tinyxmlparser.cpp b/tinyxmlparser.cpp
18index 8aa0dfa..1601962 100644
19--- a/tinyxmlparser.cpp
20+++ b/tinyxmlparser.cpp
21@@ -1606,6 +1606,10 @@ const char* TiXmlDeclaration::Parse( const char* p, TiXmlParsingData* data, TiXm
22 }
23
24 p = SkipWhiteSpace( p, _encoding );
25+ if ( !p || !*p )
26+ {
27+ break;
28+ }
29 if ( StringEqual( p, "version", true, _encoding ) )
30 {
31 TiXmlAttribute attrib;
diff --git a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
index 6fbdd071e8..b91a455aff 100644
--- a/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
+++ b/meta-oe/recipes-support/libtinyxml/libtinyxml_2.6.2.bb
@@ -5,15 +5,18 @@ HOMEPAGE = "http://www.sourceforge.net/projects/tinyxml"
5LICENSE = "Zlib" 5LICENSE = "Zlib"
6LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4" 6LIC_FILES_CHKSUM = "file://readme.txt;md5=f8f366f3370dda889f60faa7db162cf4"
7SECTION = "libs" 7SECTION = "libs"
8CVE_PRODUCT = "tinyxml"
8 9
9 10
10SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \ 11SRC_URI = "${SOURCEFORGE_MIRROR}/tinyxml/tinyxml_${@'${PV}'.replace('.', '_')}.tar.gz \
11 file://enforce-use-stl.patch \ 12 file://enforce-use-stl.patch \
12 file://entity-encoding.patch" 13 file://entity-encoding.patch \
13SRC_URI[md5sum] = "c1b864c96804a10526540c664ade67f0" 14 file://CVE-2021-42260.patch \
15 file://CVE-2023-34194.patch \
16"
14SRC_URI[sha256sum] = "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593" 17SRC_URI[sha256sum] = "15bdfdcec58a7da30adc87ac2b078e4417dbe5392f3afb719f9ba6d062645593"
15 18
16S = "${WORKDIR}/tinyxml" 19S = "${UNPACKDIR}/tinyxml"
17 20
18EXTRA_CXXFLAGS = "-I. -fPIC" 21EXTRA_CXXFLAGS = "-I. -fPIC"
19 22
diff --git a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb
index bcd309282b..89e6eca99b 100644
--- a/meta-oe/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb
+++ b/meta-oe/recipes-support/libtinyxml2/libtinyxml2_11.0.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://leethomason.github.io/tinyxml2"
3SECTION = "libs" 3SECTION = "libs"
4LICENSE = "Zlib" 4LICENSE = "Zlib"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" 5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd"
6CVE_PRODUCT = "tinyxml2"
6 7
7SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f" 8SRCREV = "9148bdf719e997d1f474be6bcc7943881046dba1"
8SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \ 9SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \
9 file://run-ptest" 10 file://run-ptest"
10 11
11S = "${WORKDIR}/git"
12 12
13inherit meson ptest 13inherit meson ptest
14 14
diff --git a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
index 4d6c06240d..28c474e1dd 100644
--- a/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
+++ b/meta-oe/recipes-support/libtommath/libtommath_1.3.0.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/libtom/libtommath.git;protocol=https;branch=master"
10 10
11SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef" 11SRCREV = "95d80fd8229d05dd6cb4ec88bc8d4f5377ff00ef"
12 12
13S = "${WORKDIR}/git"
14 13
15EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'" 14EXTRA_OEMAKE = "'PREFIX=${prefix}' 'DESTDIR=${D}' 'LIBPATH=${libdir}' 'CFLAGS=${CFLAGS}'"
16 15
diff --git a/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..f744812a3f
--- /dev/null
+++ b/meta-oe/recipes-support/liburing/liburing/0001-test-Including-missing-string.h-for-memcpy.patch
@@ -0,0 +1,39 @@
1From c55874bc28f66d606527b940d4bd0f266bbaaa2c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 17 Feb 2025 11:51:19 -0800
4Subject: [PATCH] test: Including missing string.h for memcpy
5
6Fixes
7accept-test.c:39:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
8
9Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1351]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 test/232c93d07b74.c | 1 +
13 test/accept-test.c | 1 +
14 2 files changed, 2 insertions(+)
15
16diff --git a/test/232c93d07b74.c b/test/232c93d07b74.c
17index d3053b9..d5677d3 100644
18--- a/test/232c93d07b74.c
19+++ b/test/232c93d07b74.c
20@@ -10,6 +10,7 @@
21 #include <stdlib.h>
22 #include <stdint.h>
23 #include <assert.h>
24+#include <string.h>
25
26 #include <pthread.h>
27 #include <errno.h>
28diff --git a/test/accept-test.c b/test/accept-test.c
29index 99f6080..142b2de 100644
30--- a/test/accept-test.c
31+++ b/test/accept-test.c
32@@ -7,6 +7,7 @@
33 #include <sys/socket.h>
34 #include <sys/un.h>
35 #include <assert.h>
36+#include <string.h>
37 #include "liburing.h"
38 #include "helpers.h"
39
diff --git a/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-oe/recipes-support/liburing/liburing_2.9.bb
index fc3fe1cac1..a645a8e4c4 100644
--- a/meta-oe/recipes-support/liburing/liburing_2.6.bb
+++ b/meta-oe/recipes-support/liburing/liburing_2.9.bb
@@ -9,20 +9,21 @@ SECTION = "libs"
9LICENSE = "LGPL-2.1-only | MIT" 9LICENSE = "LGPL-2.1-only | MIT"
10LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" 10LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af"
11 11
12SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" 12SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \
13SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" 13 file://0001-test-Including-missing-string.h-for-memcpy.patch"
14SRCREV = "08468cc3830185c75f9e7edefd88aa01e5c2f8ab"
14 15
15S = "${WORKDIR}/git"
16 16
17DEPENDS:append:libc-musl = " libucontext" 17DEPENDS:append:libc-musl = " libucontext"
18XCFLAGS = "-pthread" 18XCFLAGS = "-pthread"
19XCFLAGS:append:libc-musl = " -lucontext" 19XCFLAGS:append:libc-musl = " -lucontext"
20 20
21USELIBC = "" 21USELIBC = ""
22# clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro 22# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro
23# this does not happen for gcc or older clang, so link with libc since we need memset API 23# this does not happen for gcc or older clang, so link with libc since we need memset API
24# -fno-builtin-memset does not help 24# -fno-builtin-memset does not help
25USELIBC:riscv64:toolchain-clang = "--use-libc" 25USELIBC:riscv64:toolchain-clang = "--use-libc"
26USELIBC:riscv32 = "--use-libc"
26EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" 27EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'"
27do_configure() { 28do_configure() {
28 ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} 29 ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC}
diff --git a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
index 57f1f54387..960f547f94 100644
--- a/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
+++ b/meta-oe/recipes-support/libusb/libusb-compat_0.1.8.bb
@@ -28,7 +28,6 @@ SRC_URI = " \
28 file://run-ptest \ 28 file://run-ptest \
29" 29"
30SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3" 30SRCREV = "c497eff1ae8c4cfd4fdff370f04c78fa0584f4f3"
31S = "${WORKDIR}/git"
32 31
33UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases" 32UPSTREAM_CHECK_URI = "https://github.com/libusb/libusb-compat-0.1/releases"
34 33
diff --git a/meta-oe/recipes-support/libusbg/libusbg_git.bb b/meta-oe/recipes-support/libusbg/libusbg_git.bb
index 716d9c4ce4..84f97aab2c 100644
--- a/meta-oe/recipes-support/libusbg/libusbg_git.bb
+++ b/meta-oe/recipes-support/libusbg/libusbg_git.bb
@@ -12,7 +12,6 @@ SRC_URI = "git://github.com/libusbg/libusbg.git;branch=master;protocol=https \
12 file://0001-Fix-out-of-tree-builds.patch \ 12 file://0001-Fix-out-of-tree-builds.patch \
13 " 13 "
14 14
15S = "${WORKDIR}/git"
16 15
17ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets" 16ALTERNATIVE:${PN} = "gadget-acm-ecm show-gadgets"
18ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm" 17ALTERNATIVE_LINK_NAME[gadget-acm-ecm] = "${bindir}/gadget-acm-ecm"
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
index c79dd092cd..f3870203ad 100644
--- a/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
+++ b/meta-oe/recipes-support/libusbgx/libusbgx-config.bb
@@ -4,8 +4,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384
4 4
5SRC_URI = "file://usbgx.default" 5SRC_URI = "file://usbgx.default"
6 6
7S = "${WORKDIR}/sources" 7S = "${UNPACKDIR}"
8UNPACKDIR = "${S}"
9 8
10do_configure[noexec] = "1" 9do_configure[noexec] = "1"
11do_compile[noexec] = "1" 10do_compile[noexec] = "1"
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start
index e80cb2c340..4ef679888e 100755
--- a/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start
+++ b/meta-oe/recipes-support/libusbgx/libusbgx/gadget-start
@@ -15,6 +15,10 @@ for i in $ENABLED_SCHEMAS; do
15 if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then 15 if [ -n "${configured_udc}" ] && [ -e "/sys/class/udc/${configured_udc}" ]; then
16 echo ${configured_udc} > /sys/kernel/config/usb_gadget/"$i"/UDC 16 echo ${configured_udc} > /sys/kernel/config/usb_gadget/"$i"/UDC
17 else 17 else
18 ls /sys/class/udc/ > /sys/kernel/config/usb_gadget/"$i"/UDC 18 detected_udc=$(ls /sys/class/udc/)
19 if [ -z "${detected_udc}" ]; then
20 exit 1
21 fi
22 echo "${detected_udc}" > /sys/kernel/config/usb_gadget/"$i"/UDC
19 fi 23 fi
20done 24done
diff --git a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
index bc40f029cd..7b12b911d8 100644
--- a/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
+++ b/meta-oe/recipes-support/libusbgx/libusbgx_git.bb
@@ -18,7 +18,6 @@ SRC_URI = " \
18 file://usbgx.service \ 18 file://usbgx.service \
19" 19"
20 20
21S = "${WORKDIR}/git"
22 21
23PACKAGECONFIG ??= "examples gadget-schemes libconfig" 22PACKAGECONFIG ??= "examples gadget-schemes libconfig"
24PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig" 23PACKAGECONFIG[libconfig] = "--with-libconfig=yes,--without-libconfig,libconfig"
@@ -35,12 +34,12 @@ SYSTEMD_AUTO_ENABLE:${PN}-examples = "${@bb.utils.contains('PACKAGECONFIG', 'exa
35INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}" 34INITSCRIPT_PACKAGES = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '${PN}-examples', '', d)}"
36INITSCRIPT_NAME = "usbgx" 35INITSCRIPT_NAME = "usbgx"
37INITSCRIPT_PARAMS = "defaults" 36INITSCRIPT_PARAMS = "defaults"
38INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '1', '0', d)}" 37INHIBIT_UPDATERCD_BBCLASS = "${@bb.utils.contains('PACKAGECONFIG', 'examples', '', '1', d)}"
39 38
40do_install:append() { 39do_install:append() {
41 install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start 40 install -Dm 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-start
42 sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start 41 sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-start
43 install -m 0755 ${UNPACKDIR}/gadget-start ${D}${bindir}/gadget-stop 42 install -m 0755 ${UNPACKDIR}/gadget-stop ${D}${bindir}/gadget-stop
44 sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop 43 sed -i -e 's,/usr/bin,${bindir},g' -e 's,/etc,${sysconfdir},g' ${D}${bindir}/gadget-stop
45 44
46 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then 45 if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
diff --git a/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
index 0d2cd135c6..cc28860b04 100644
--- a/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
+++ b/meta-oe/recipes-support/libutempter/libutempter_1.2.2-alt1.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://git.altlinux.org/people/ldv/packages/libutempter.git;branch=mas
14 file://0002-Proper-macro-path-generation.patch \ 14 file://0002-Proper-macro-path-generation.patch \
15 " 15 "
16 16
17S = "${WORKDIR}/git/${BPN}" 17S = "${UNPACKDIR}/${BP}/${BPN}"
18 18
19CFLAGS += "-DLIBEXECDIR=${libexecdir}" 19CFLAGS += "-DLIBEXECDIR=${libexecdir}"
20 20
diff --git a/meta-oe/recipes-support/links/links-x11_2.26.bb b/meta-oe/recipes-support/links/links-x11_2.26.bb
index 713919bca1..c1601ab7d9 100644
--- a/meta-oe/recipes-support/links/links-x11_2.26.bb
+++ b/meta-oe/recipes-support/links/links-x11_2.26.bb
@@ -13,7 +13,7 @@ SRC_URI += " file://links2.desktop \
13SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb" 13SRC_URI[sha256sum] = "f05b3577f25dbe63e491c424f0ecb31f7bfadce9b2bc2f111dfed049c004c9cb"
14SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47" 14SRC_URI[icon.sha256sum] = "eddcd8b8c8698aa621d1a453943892d77b72ed492e0d14e0dbac5c6a57e52f47"
15 15
16S = "${WORKDIR}/links-${PV}" 16S = "${UNPACKDIR}/links-${PV}"
17 17
18EXTRA_OECONF = "--enable-graphics \ 18EXTRA_OECONF = "--enable-graphics \
19 --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \ 19 --with-ssl=${STAGING_LIBDIR}/.. --with-libjpeg \
diff --git a/meta-oe/recipes-support/links/links_2.29.bb b/meta-oe/recipes-support/links/links_2.29.bb
index e3a15d1819..311d84e484 100644
--- a/meta-oe/recipes-support/links/links_2.29.bb
+++ b/meta-oe/recipes-support/links/links_2.29.bb
@@ -9,3 +9,5 @@ EXTRA_OECONF = "--enable-graphics \
9 --without-directfb --without-pmshell --without-atheos \ 9 --without-directfb --without-pmshell --without-atheos \
10 --without-x" 10 --without-x"
11SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" 11SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998"
12
13CVE_STATUS[CVE-2008-3319] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different links package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch b/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
deleted file mode 100644
index 86edcc2e42..0000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils/0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch
+++ /dev/null
@@ -1,63 +0,0 @@
1From 2cc2315eecaa48fd24792aaa889dc7d9fb96978b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 20 Mar 2017 22:18:44 -0700
4Subject: [PATCH] Makefiles: Respect environment variables and add LDFLAGS to
5 linker cmdline
6
7Fixes QA errors about GNU_HASH
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 mib-modules/Makefile | 10 +++++-----
14 tools/Makefile | 2 +-
15 2 files changed, 6 insertions(+), 6 deletions(-)
16
17diff --git a/mib-modules/Makefile b/mib-modules/Makefile
18index 0d54c9b..051d4d2 100644
19--- a/mib-modules/Makefile
20+++ b/mib-modules/Makefile
21@@ -17,13 +17,13 @@ TARG = iscsiTargetMib.so
22 OBJS = iscsiTargetMib.o iscsiMib.o scsiMib.o ipsAuthMib.o \
23 iscsiAuthData.o
24
25-CC = gcc
26-CFLAGS = -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
27+CC ?= gcc
28+CFLAGS += -I$(INCLDIR) -I$(INCLDIR)/agent -I$(INCLDIR)/agent/mibgroup -shared -fPIC
29 CFLAGS += -I../include -Wall -Werror
30 #CFLAGS +=$(AUTO_CFLAGS)
31
32-LD = gcc -shared
33-
34+LD ?= gcc
35+LDFLAGS += -shared
36 INSTALL = install
37
38 all: $(TARG)
39@@ -32,7 +32,7 @@ all: $(TARG)
40 $(CC) $(CFLAGS) -o $@ -c $<
41
42 $(TARG): $(OBJS)
43- $(LD) -o $@ $(OBJS)
44+ $(LD) -o $@ $(OBJS) $(LDFLAGS)
45
46 clean:
47 rm -f $(OBJS) $(TARG)
48diff --git a/tools/Makefile b/tools/Makefile
49index 79ed3cd..ffd9bf3 100644
50--- a/tools/Makefile
51+++ b/tools/Makefile
52@@ -6,7 +6,7 @@ ISCSI_NAME_OBJS = $(ISCSI_NAME_SRCS:.c=.o)
53 all:: $(ISCSI_NAME)
54
55 $(ISCSI_NAME): $(ISCSI_NAME_OBJS)
56- $(CC) -o $@ $(CFLAGS) $(ISCSI_NAME_OBJS)
57+ $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $(ISCSI_NAME_OBJS)
58
59 clean:
60 rm -f $(ISCSI_NAME_OBJS) $(ISCSI_NAME)
61--
622.12.0
63
diff --git a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb b/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
deleted file mode 100644
index 844e5acf90..0000000000
--- a/meta-oe/recipes-support/lio-utils/lio-utils_4.1.bb
+++ /dev/null
@@ -1,75 +0,0 @@
1SUMMARY = "lio-utils"
2DESCRIPTION = "a simple low-level configuration tool set for the Target+iSCSI (LIO)"
3HOMEPAGE = "http://linux-iscsi.org/index.php/Lio-utils"
4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://debian/copyright;md5=c3ea231a32635cbb5debedf3e88aa3df"
6
7PV = "4.1+git"
8
9SRC_URI = "git://github.com/Datera/lio-utils.git;branch=master;protocol=https \
10 file://0001-Makefiles-Respect-environment-variables-and-add-LDFL.patch \
11 "
12SRCREV = "0ac9091c1ff7a52d5435a4f4449e82637142e06e"
13S = "${WORKDIR}/git"
14
15inherit ${@bb.utils.contains("BBFILE_COLLECTIONS", "meta-python2", "distutils", "", d)}
16
17EXTRA_OEMAKE += "DESTDIR=${D}"
18
19do_compile() {
20 cd ${S}/tcm-py
21 distutils_do_compile
22
23 cd ${S}/lio-py
24 distutils_do_compile
25
26 if test -d ${S}/tools; then
27 oe_runmake -C ${S}/tools
28 fi
29}
30
31do_install() {
32 cd ${S}/tcm-py
33 distutils_do_install
34
35 cd ${S}/lio-py
36 distutils_do_install
37
38 SITE_PACKAGES=${D}/${PYTHON_SITEPACKAGES_DIR}
39 install -d ${D}/${sbindir}
40 for var in tcm_node tcm_dump tcm_loop tcm_fabric lio_dump lio_node; do
41 if [ ! -h ${D}/${sbindir}/${var} ];then
42 chmod a+x ${SITE_PACKAGES}/${var}.py
43 ln -s ${PYTHON_SITEPACKAGES_DIR}/${var}.py ${D}/${sbindir}/${var}
44 fi
45 done
46
47 if test -d ${S}/tools; then
48 oe_runmake -C ${S}/tools install
49 fi
50
51 install -d ${D}/etc/target/
52 install -d ${D}/etc/init.d/
53 install -m 755 ${S}/scripts/rc.target ${D}/etc/init.d/
54 install -m 755 ${S}/conf/tcm_start.default ${D}/etc/target/tcm_start.sh
55 install -m 755 ${S}/conf/lio_start.default ${D}/etc/target/lio_start.sh
56}
57
58SKIP_RECIPE[lio-utils] ?= "${@bb.utils.contains('I_SWEAR_TO_MIGRATE_TO_PYTHON3', 'yes', '', 'python2 is out of support for long time, read https://www.python.org/doc/sunset-python-2/ https://python3statement.org/ and if you really have to temporarily use this, then set I_SWEAR_TO_MIGRATE_TO_PYTHON3 to "yes"', d)}"
59
60RDEPENDS:${PN} += "python-stringold python-subprocess python-shell \
61 python-datetime python-textutils python-crypt python-netclient python-email \
62 bash"
63
64FILES:${PN} += "${sbindir}/* /etc/init.d/* /etc/target/*"
65
66# http://errors.yoctoproject.org/Errors/Details/184712/
67# python-native/python: can't open file 'setup.py': [Errno 2] No such file or directory
68CLEANBROKEN = "1"
69
70python() {
71 if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split():
72 raise bb.parse.SkipRecipe('Requires meta-python2 to be present.')
73}
74
75
diff --git a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
index a52ca25da4..5fe3006524 100644
--- a/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
+++ b/meta-oe/recipes-support/lockdev/lockdev_1.0.3.bb
@@ -1,7 +1,7 @@
1SUMMARY = "Locking devices library" 1SUMMARY = "Locking devices library"
2SECTION = "libs" 2SECTION = "libs"
3LICENSE = "LGPL-2.1-only" 3LICENSE = "LGPL-2.1-only"
4LIC_FILES_CHKSUM="file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=d8045f3b8f929c1cb29a1e3fd737b499"
5 5
6PE = "1" 6PE = "1"
7SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \ 7SRC_URI = "http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_${PV}.orig.tar.gz \
diff --git a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
index 7d9b9d50f8..a0bd40b03a 100644
--- a/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
+++ b/meta-oe/recipes-support/log4c/log4c_1.2.4.bb
@@ -8,7 +8,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
8 file://0001-Use-the-API-properly-in-the-example-format-security-.patch \ 8 file://0001-Use-the-API-properly-in-the-example-format-security-.patch \
9 " 9 "
10 10
11SRC_URI[md5sum] = "0d94919136e1d16b68427562e74cb3dd"
12SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea" 11SRC_URI[sha256sum] = "5991020192f52cc40fa852fbf6bbf5bd5db5d5d00aa9905c67f6f0eadeed48ea"
13 12
14PACKAGECONFIG ??= "expat" 13PACKAGECONFIG ??= "expat"
diff --git a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
index 729857eb62..d51e51387b 100644
--- a/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
+++ b/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb
@@ -8,10 +8,12 @@ SRC_URI = "http://downloads.sourceforge.net/${BPN}/${BP}.tar.gz \
8 " 8 "
9SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6" 9SRC_URI[sha256sum] = "696113659e426540625274a8b251052cc04306d8ee5c42a0c7639f39ca90c9d6"
10 10
11S = "${WORKDIR}/${BPN}" 11S = "${UNPACKDIR}/${BPN}"
12 12
13inherit autotools pkgconfig 13inherit autotools pkgconfig
14 14
15EXTRA_AUTORECONF += "-I m4"
16
15EXTRA_OECONF = "\ 17EXTRA_OECONF = "\
16 --enable-doxygen=no \ 18 --enable-doxygen=no \
17 --enable-dot=no \ 19 --enable-dot=no \
@@ -20,3 +22,7 @@ EXTRA_OECONF = "\
20" 22"
21 23
22CXXFLAGS += "-std=c++14" 24CXXFLAGS += "-std=c++14"
25
26do_install:append() {
27 sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/log4cpp-config
28}
diff --git a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb
index 3549cb2153..6be82979a4 100644
--- a/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb
+++ b/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb
@@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
11 11
12SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz" 12SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz"
13 13
14SRC_URI[md5sum] = "e544a6230673ea54f7430bf817bb39d8" 14SRC_URI[sha256sum] = "062d197349f4a43d8f69887fc642cb58b59a8e2cc54cc951d5c1c6abc4809a9a"
15SRC_URI[sha256sum] = "8dbfcf9b28c782ab3bddd6a620d4fb95d1b0ffcbe93276996cdc4800aa9aebd1" 15
16UPSTREAM_CHECK_URI = "https://github.com/archiecobbs/logwarn/tags"
17UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)"
16 18
17inherit autotools-brokensep 19inherit autotools-brokensep
18 20
diff --git a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
deleted file mode 100644
index f4b0f913d8..0000000000
--- a/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001
2From: Kai Kang <kai.kang@windriver.com>
3Date: Wed, 6 Dec 2023 10:24:46 +0800
4Subject: [PATCH] configure.ac: check egrep
5
6The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed
7from configure.ac, then it fails to substitute '@EGREP@':
8
9| [GEN] command-lines-input.h
10| /bin/bash: line 2: @EGREP@: command not found
11| [GEN] command-count.h
12
13Call AC_PROG_EGREP to fix the error.
14
15Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4]
16
17Signed-off-by: Kai Kang <kai.kang@windriver.com>
18---
19 configure.ac | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/configure.ac b/configure.ac
23index c2dbf3c9f..d9e7964c3 100644
24--- a/configure.ac
25+++ b/configure.ac
26@@ -88,6 +88,7 @@ AC_PROG_EGREP
27 AC_PROG_MAKE_SET
28 AC_PROG_MKDIR_P
29 AC_PROG_RANLIB
30+AC_PROG_EGREP
31 AC_CHECK_TOOL([READELF], [readelf])
32 AC_CHECK_TOOL(AR, ar)
33 AC_PATH_TOOL(CFLOW_CMD, cflow)
diff --git a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
index e11ac5ac08..1f6b89f2b6 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch
@@ -1,4 +1,4 @@
1From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 1From 65a04547541894b3ec56bd70510b164810cd64b3 Mon Sep 17 00:00:00 2001
2From: Dengke Du <dengke.du@windriver.com> 2From: Dengke Du <dengke.du@windriver.com>
3Date: Tue, 25 Oct 2016 11:49:40 +0000 3Date: Tue, 25 Oct 2016 11:49:40 +0000
4Subject: [PATCH] implement libc specific reopen_stream 4Subject: [PATCH] implement libc specific reopen_stream
@@ -21,7 +21,7 @@ Upstream-Status: Pending
21 2 files changed, 9 insertions(+), 3 deletions(-) 21 2 files changed, 9 insertions(+), 3 deletions(-)
22 22
23diff --git a/lib/log/log.c b/lib/log/log.c 23diff --git a/lib/log/log.c b/lib/log/log.c
24index 7b88252f0..e1720098a 100644 24index 90905e629..ed69662d0 100644
25--- a/lib/log/log.c 25--- a/lib/log/log.c
26+++ b/lib/log/log.c 26+++ b/lib/log/log.c
27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_ 27@@ -165,6 +165,7 @@ static void _check_and_replace_standard_log_streams(FILE *old_stream, FILE *new_
@@ -45,10 +45,10 @@ index 7b88252f0..e1720098a 100644
45 void init_log_fn(lvm2_log_fn_t log_fn) 45 void init_log_fn(lvm2_log_fn_t log_fn)
46 { 46 {
47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c 47diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c
48index 3fd23a521..c2ee39905 100644 48index 22ae1e3bb..b0928bc04 100644
49--- a/tools/lvmcmdline.c 49--- a/tools/lvmcmdline.c
50+++ b/tools/lvmcmdline.c 50+++ b/tools/lvmcmdline.c
51@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) 51@@ -3407,7 +3407,7 @@ static int _check_standard_fds(void)
52 int err = is_valid_fd(STDERR_FILENO); 52 int err = is_valid_fd(STDERR_FILENO);
53 53
54 if (!is_valid_fd(STDIN_FILENO) && 54 if (!is_valid_fd(STDIN_FILENO) &&
@@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644
57 if (err) 57 if (err)
58 perror("stdin stream open"); 58 perror("stdin stream open");
59 else 59 else
60@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) 60@@ -3417,7 +3417,7 @@ static int _check_standard_fds(void)
61 } 61 }
62 62
63 if (!is_valid_fd(STDOUT_FILENO) && 63 if (!is_valid_fd(STDOUT_FILENO) &&
@@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644
66 if (err) 66 if (err)
67 perror("stdout stream open"); 67 perror("stdout stream open");
68 /* else no stdout */ 68 /* else no stdout */
69@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) 69@@ -3425,7 +3425,7 @@ static int _check_standard_fds(void)
70 } 70 }
71 71
72 if (!is_valid_fd(STDERR_FILENO) && 72 if (!is_valid_fd(STDERR_FILENO) &&
diff --git a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
index 83a7f936b1..2fcbc12b22 100644
--- a/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
+++ b/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch
@@ -1,4 +1,4 @@
1From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 1From c7a63e17fc841eab5874aa5dc4e848e2bf300bf0 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 25 Mar 2024 13:07:28 -0700 3Date: Mon, 25 Mar 2024 13:07:28 -0700
4Subject: [PATCH] include libgen.h for basename 4Subject: [PATCH] include libgen.h for basename
@@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 1 file changed, 1 insertion(+) 16 1 file changed, 1 insertion(+)
17 17
18diff --git a/lib/device/device_id.c b/lib/device/device_id.c 18diff --git a/lib/device/device_id.c b/lib/device/device_id.c
19index 2b183810a..53467cbbb 100644 19index a3f341bfc..0c05eb151 100644
20--- a/lib/device/device_id.c 20--- a/lib/device/device_id.c
21+++ b/lib/device/device_id.c 21+++ b/lib/device/device_id.c
22@@ -26,6 +26,7 @@ 22@@ -27,6 +27,7 @@
23 #include "lib/datastruct/str_list.h" 23 #include "lib/display/display.h"
24 #include "lib/metadata/metadata-exported.h" 24 #include "device_mapper/misc/dm-ioctl.h"
25 25
26+#include <libgen.h> 26+#include <libgen.h>
27 #include <sys/stat.h> 27 #include <sys/stat.h>
diff --git a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
index 6435c3fd92..ac5c440e4e 100644
--- a/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
+++ b/meta-oe/recipes-support/lvm2/files/0004-tweak-MODPROBE_CMD-for-cross-compile.patch
@@ -1,4 +1,4 @@
1From b30f842d5d200a8217a47465d6cdd99d3805ba76 Mon Sep 17 00:00:00 2001 1From 53a879b5a285722f0cb0ee42607c1cd1102b79be Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 31 Jul 2018 15:04:29 +0800 3Date: Tue, 31 Jul 2018 15:04:29 +0800
4Subject: [PATCH] tweak MODPROBE_CMD for cross compile 4Subject: [PATCH] tweak MODPROBE_CMD for cross compile
@@ -21,10 +21,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21 1 file changed, 2 deletions(-) 21 1 file changed, 2 deletions(-)
22 22
23diff --git a/configure.ac b/configure.ac 23diff --git a/configure.ac b/configure.ac
24index c8d81e16c..7c1c04627 100644 24index e5e5e71ce..3af73c781 100644
25--- a/configure.ac 25--- a/configure.ac
26+++ b/configure.ac 26+++ b/configure.ac
27@@ -1689,8 +1689,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [ 27@@ -1742,8 +1742,6 @@ AS_IF([test "$BUILD_DMFILEMAPD" = "yes"], [
28 ]) 28 ])
29 29
30 ################################################################################ 30 ################################################################################
diff --git a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
index e7aaad4d0e..f7a85b4b3f 100644
--- a/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
+++ b/meta-oe/recipes-support/lvm2/files/0005-do-not-build-manual.patch
@@ -1,4 +1,4 @@
1From e0e06b77e067da6a01dd9b0d5582a0a1709c655d Mon Sep 17 00:00:00 2001 1From 8657541b91b4f2bd05ce14ec9899ff5f9f3b7d4c Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 26 Nov 2018 14:59:55 +0800 3Date: Mon, 26 Nov 2018 14:59:55 +0800
4Subject: [PATCH] do not build manual 4Subject: [PATCH] do not build manual
@@ -57,10 +57,10 @@ index 06c4b1823..90df7b09c 100644
57 57
58 ifeq ("@INTL@", "yes") 58 ifeq ("@INTL@", "yes")
59diff --git a/configure.ac b/configure.ac 59diff --git a/configure.ac b/configure.ac
60index 7c1c04627..5364dd68e 100644 60index 3af73c781..f32d1f376 100644
61--- a/configure.ac 61--- a/configure.ac
62+++ b/configure.ac 62+++ b/configure.ac
63@@ -2022,7 +2022,6 @@ libdaemon/server/Makefile 63@@ -2076,7 +2076,6 @@ libdaemon/server/Makefile
64 libdm/Makefile 64 libdm/Makefile
65 libdm/dm-tools/Makefile 65 libdm/dm-tools/Makefile
66 libdm/libdevmapper.pc 66 libdm/libdevmapper.pc
diff --git a/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-oe/recipes-support/lvm2/libdevmapper.bb
index be558ce1d2..3b4439c3ae 100644
--- a/meta-oe/recipes-support/lvm2/libdevmapper.bb
+++ b/meta-oe/recipes-support/lvm2/libdevmapper.bb
@@ -5,6 +5,8 @@ require lvm2.inc
5 5
6DEPENDS += "autoconf-archive-native" 6DEPENDS += "autoconf-archive-native"
7 7
8inherit nopackages
9
8TARGET_CC_ARCH += "${LDFLAGS}" 10TARGET_CC_ARCH += "${LDFLAGS}"
9 11
10do_install() { 12do_install() {
diff --git a/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-oe/recipes-support/lvm2/lvm2.bb
index 868f5a249e..f569424e27 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.bb
+++ b/meta-oe/recipes-support/lvm2/lvm2.bb
@@ -1,7 +1,6 @@
1require lvm2.inc 1require lvm2.inc
2 2
3SRC_URI += " \ 3SRC_URI += " \
4 file://0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch \
5 file://tweak-for-lvmdbusd.patch \ 4 file://tweak-for-lvmdbusd.patch \
6 " 5 "
7 6
@@ -38,7 +37,7 @@ do_install:append() {
38 || true 37 || true
39} 38}
40 39
41PACKAGE_BEFORE_PN = "${PN}-scripts ${PN}-udevrules" 40PACKAGE_BEFORE_PN = "${PN}-scripts"
42 41
43SYSTEMD_PACKAGES = "${PN}" 42SYSTEMD_PACKAGES = "${PN}"
44SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \ 43SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'dmeventd', 'lvm2-monitor.service dm-event.socket dm-event.service', '', d)} \
@@ -57,21 +56,30 @@ LVM2_PACKAGECONFIG:append:class-target = " \
57" 56"
58 57
59PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" 58PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev"
60PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" 59PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,"
61 60
62PACKAGES =+ "libdevmapper" 61PACKAGES =+ "libdevmapper"
63FILES:libdevmapper = " \ 62FILES:libdevmapper = " \
64 ${libdir}/libdevmapper.so.* \ 63 ${libdir}/libdevmapper.so.* \
65 ${sbindir}/dmsetup \ 64 ${sbindir}/dmsetup \
66 ${sbindir}/dmstats \ 65 ${sbindir}/dmstats \
66 ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \
67 ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \
68 ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \
67" 69"
68 70
69FILES:${PN} += " \ 71FILES:${PN} += " \
70 ${libdir}/device-mapper/*.so \ 72 ${libdir}/device-mapper/*.so \
71 ${systemd_system_unitdir}/lvm2-pvscan@.service \ 73 ${systemd_system_unitdir} \
72 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ 74 ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \
73 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ 75 ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \
76 ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \
77 ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \
74" 78"
79# Remove /lib/udev from FILES:${PN} so that any new rules files that are added
80# upstream will have to be explicitly added to either FILES:${PN} or
81# FILES:libdevmapper.
82FILES:${PN}:remove = "${nonarch_base_libdir}/udev"
75 83
76FILES:${PN}-scripts = " \ 84FILES:${PN}-scripts = " \
77 ${sbindir}/blkdeactivate \ 85 ${sbindir}/blkdeactivate \
@@ -79,11 +87,8 @@ FILES:${PN}-scripts = " \
79 ${sbindir}/lvmconf \ 87 ${sbindir}/lvmconf \
80 ${sbindir}/lvmdump \ 88 ${sbindir}/lvmdump \
81" 89"
82# Specified explicitly for the udev rules, just in case that it does not get picked 90
83# up automatically:
84FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d"
85RDEPENDS:${PN} = "bash" 91RDEPENDS:${PN} = "bash"
86RDEPENDS:${PN}-udevrules = "libdevmapper"
87RDEPENDS:${PN}:append:class-target = " libdevmapper" 92RDEPENDS:${PN}:append:class-target = " libdevmapper"
88RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" 93RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper"
89 94
diff --git a/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-oe/recipes-support/lvm2/lvm2.inc
index 29cc7425ba..0ff17aed5c 100644
--- a/meta-oe/recipes-support/lvm2/lvm2.inc
+++ b/meta-oe/recipes-support/lvm2/lvm2.inc
@@ -15,18 +15,39 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \
15 file://0005-do-not-build-manual.patch \ 15 file://0005-do-not-build-manual.patch \
16 file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ 16 file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \
17 file://reproducible-build.patch \ 17 file://reproducible-build.patch \
18 file://0001-configure.ac-check-egrep.patch \
19 file://0001-include-libgen.h-for-basename.patch \ 18 file://0001-include-libgen.h-for-basename.patch \
20 " 19 "
21 20
22SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" 21SRCREV = "8817523c5682a7fd83770d3f58a99c436f7e73f7"
23S = "${WORKDIR}/git" 22PV = "2.03.32"
24PV = "2.03.24"
25 23
26UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" 24UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)"
27 25
28inherit autotools-brokensep pkgconfig systemd 26inherit autotools-brokensep pkgconfig systemd
29 27
28def get_dm_version(p):
29 import re
30
31 fn = p + '/VERSION_DM'
32 try:
33 f = open(fn, 'r')
34 except IOError:
35 return None
36
37 lines = f.readlines()
38 f.close()
39 for line in lines:
40 m = re.match(r'(\w+)[-. ](\w+)[-. ](\w+)', line.strip())
41 if m:
42 return ".".join([m.group(1), m.group(2), m.group(3)])
43
44 return None
45
46DM_VERSION = '${@get_dm_version("${S}")}'
47python do_package:prepend() {
48 d.setVar('PKGV:libdevmapper', d.getVar("DM_VERSION"))
49}
50
30LVM2_PACKAGECONFIG = "dmeventd" 51LVM2_PACKAGECONFIG = "dmeventd"
31LVM2_PACKAGECONFIG:append:class-target = " \ 52LVM2_PACKAGECONFIG:append:class-target = " \
32 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \ 53 ${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)} \
@@ -59,7 +80,3 @@ EXTRA_OECONF = "--with-user= \
59 --with-thin-repair=${sbindir}/thin_repair \ 80 --with-thin-repair=${sbindir}/thin_repair \
60 --with-thin-restore=${sbindir}/thin_restore \ 81 --with-thin-restore=${sbindir}/thin_restore \
61" 82"
62
63# gold doesn't like multiple dm_bitset_parse_list definitions in libdm/.exported_symbols.DM_1_02_138 and libdm/.exported_symbols.DM_1_02_129
64# after it was uncommented in the later in 2.03.12 with https://github.com/lvmteam/lvm2/commit/60eb608d66c2056a78e81f27db3da14139d9faab
65LDFLAGS:append = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', " -fuse-ld=bfd", '', d)}"
diff --git a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch b/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
deleted file mode 100644
index 96a3d64fdf..0000000000
--- a/meta-oe/recipes-support/lvm2/lvm2/0001-fix-command-bin-findmnt-bin-lsblk-bin-sort-not-found.patch
+++ /dev/null
@@ -1,70 +0,0 @@
1From 2ff2a867db8d3e1c660d191a1805f9e355169c80 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Tue, 2 Mar 2021 01:33:05 -0800
4Subject: [PATCH] fix command /bin/findmnt, /bin/lsblk, /bin/sort not found
5
6In oe-core (util-linux and coreutils), the commands locates in
7${bindir} rather than /bin, add BINDIR to configure it
8
9Upstream-Status: Inappropriate [oe specific]
10
11Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
12---
13 configure.ac | 3 +++
14 scripts/blkdeactivate.sh.in | 7 ++++---
15 2 files changed, 7 insertions(+), 3 deletions(-)
16
17diff --git a/configure.ac b/configure.ac
18index d9e7964c3..9dfdcfe01 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -1704,6 +1704,8 @@ AS_IF([test -n "$MODPROBE_CMD"], [
22
23 SYSCONFDIR="$(eval echo $(eval echo $sysconfdir))"
24
25+BINDIR="$(eval echo $(eval echo $bindir))"
26+
27 SBINDIR="$(eval echo $(eval echo $sbindir))"
28 LVM_PATH="$SBINDIR/lvm"
29 AC_DEFINE_UNQUOTED(LVM_PATH, ["$LVM_PATH"], [Path to lvm binary.])
30@@ -1944,6 +1946,7 @@ AC_SUBST(PYTHON2DIR)
31 AC_SUBST(PYTHON3)
32 AC_SUBST(PYTHON3DIR)
33 AC_SUBST(RT_LIBS)
34+AC_SUBST(BINDIR)
35 AC_SUBST(SBINDIR)
36 AC_SUBST(SELINUX_LIBS)
37 AC_SUBST(SELINUX_PC)
38diff --git a/scripts/blkdeactivate.sh.in b/scripts/blkdeactivate.sh.in
39index 7c517b87b..7ef1bb766 100644
40--- a/scripts/blkdeactivate.sh.in
41+++ b/scripts/blkdeactivate.sh.in
42@@ -42,13 +42,14 @@ VDO="/bin/vdo"
43
44 sbindir="@SBINDIR@"
45 DMSETUP="$sbindir/dmsetup"
46+bindir="@BINDIR@"
47 LVM="$sbindir/lvm"
48
49 if "$UMOUNT" --help | grep -- "--all-targets" >"$DEV_DIR/null"; then
50 UMOUNT_OPTS="--all-targets "
51 else
52 UMOUNT_OPTS=""
53- FINDMNT="/bin/findmnt -r --noheadings -u -o TARGET"
54+ FINDMNT="$bindir/findmnt -r --noheadings -u -o TARGET"
55 FINDMNT_READ="read -r mnt"
56 fi
57 DMSETUP_OPTS=""
58@@ -57,10 +58,10 @@ MDADM_OPTS=""
59 MPATHD_OPTS=""
60 VDO_OPTS=""
61
62-LSBLK="/bin/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
63+LSBLK="$bindir/lsblk -r --noheadings -o TYPE,KNAME,NAME,MOUNTPOINT"
64 LSBLK_VARS="local devtype local kname local name local mnt"
65 LSBLK_READ="read -r devtype kname name mnt"
66-SORT_MNT="/bin/sort -r -u -k 4"
67+SORT_MNT="$bindir/sort -r -u -k 4"
68
69 # Do not show tool errors by default (only done/skipping summary
70 # message provided by this script) and no verbose mode by default.
diff --git a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
index ccc21f418c..01e7645ef9 100644
--- a/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
+++ b/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb
@@ -8,7 +8,8 @@ SRC_URI = " \
8 http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \ 8 http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \
9" 9"
10 10
11SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44" 11UPSTREAM_CHECK_URI = "http://www.maier-komor.de/mbuffer.html"
12
12SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99" 13SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99"
13 14
14inherit autotools 15inherit autotools
diff --git a/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-oe/recipes-support/mcelog/mce-inject_git.bb
index a228c3cc06..c8ffb65fa1 100644
--- a/meta-oe/recipes-support/mcelog/mce-inject_git.bb
+++ b/meta-oe/recipes-support/mcelog/mce-inject_git.bb
@@ -6,7 +6,7 @@ SECTION = "System Environment/Base"
6 6
7SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" 7SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master"
8 8
9SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" 9SRCREV = "ca81c1dbed5c7e30fe79d44953ccfeaab98d2b4f"
10 10
11UPSTREAM_CHECK_COMMITS = "1" 11UPSTREAM_CHECK_COMMITS = "1"
12 12
@@ -15,10 +15,11 @@ DEPENDS = "bison-native"
15LICENSE = "GPL-2.0-only" 15LICENSE = "GPL-2.0-only"
16LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6" 16LIC_FILES_CHKSUM = "file://README;beginline=30;md5=94c18755082a2da9c9cf97cba3ad47d6"
17 17
18S = "${WORKDIR}/git"
19 18
20COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux' 19COMPATIBLE_HOST = '(x86_64.*|i.86.*)-linux'
21 20
22inherit autotools-brokensep 21EXTRA_OEMAKE = "CFLAGS='${CFLAGS}'"
23 22
24EXTRA_OEMAKE = "destdir=${D} CFLAGS='${CFLAGS}'" 23do_install() {
24 oe_runmake 'destdir=${D}' install
25}
diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
index 969bfc17cf..80b9ae23b3 100644
--- a/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
+++ b/meta-oe/recipes-support/mcelog/mce-test/0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] gcov_merge.py/scov_merge.py: switch to python3
5 5
6Make gcov_merge.py and scov_merge.py port to python3. 6Make gcov_merge.py and scov_merge.py port to python3.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/8]
9 9
10Signed-off-by: Mingli Yu <mingli.yu@windriver.com> 10Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
11--- 11---
diff --git a/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch
new file mode 100644
index 0000000000..3b2e9502ae
--- /dev/null
+++ b/meta-oe/recipes-support/mcelog/mce-test/0001-ltp-pan-fix-wait_handler-declaration.patch
@@ -0,0 +1,47 @@
1From 3f1f2d143a1e365bb0451609d08194756951099a Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Tue, 22 Apr 2025 18:03:24 +0000
4Subject: [PATCH] ltp-pan: fix wait_handler declaration
5
6to match definition in:
7tools/ltp-pan/ltp-pan.c:wait_handler( int sig )
8
9* fixes build with gcc-15:
10 http://errors.yoctoproject.org/Errors/Details/852857/
11
12ltp-pan.c: In function 'main':
13ltp-pan.c:459:19: error: assignment to '__sighandler_t' {aka 'void (*)(int)'} from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
14 459 | sa.sa_handler = wait_handler;
15 | ^
16In file included from ltp-pan.c:67:
17zoolib.h:52:6: note: 'wait_handler' declared here
18 52 | void wait_handler();
19 | ^~~~~~~~~~~~
20In file included from TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/sys/param.h:28,
21 from ltp-pan.c:56:
22TOPDIR/tmp/work/core2-64-oe-linux/mce-test/20230601+git/recipe-sysroot/usr/include/signal.h:72:16: note: '__sighandler_t' declared here
23 72 | typedef void (*__sighandler_t) (int);
24 | ^~~~~~~~~~~~~~
25ltp-pan.c:489:17: error: too many arguments to function 'wait_handler'; expected 0, have 1
26 489 | wait_handler(SIGINT);
27 | ^~~~~~~~~~~~ ~~~~~~
28
29Upstream-Status: Submitted [https://github.com/andikleen/mce-test/pull/9]
30Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
31---
32 tools/ltp-pan/zoolib.h | 2 +-
33 1 file changed, 1 insertion(+), 1 deletion(-)
34
35diff --git a/tools/ltp-pan/zoolib.h b/tools/ltp-pan/zoolib.h
36index 8b4049e..34ce76f 100644
37--- a/tools/ltp-pan/zoolib.h
38+++ b/tools/ltp-pan/zoolib.h
39@@ -49,7 +49,7 @@ extern char zoo_error[ZELEN];
40 int lock_file( FILE *fp, short ltype, char **errmsg );
41 /* FILE *open_file( char *file, char *mode, char **errmsg ); */
42
43-void wait_handler();
44+void wait_handler(int sig);
45
46 /* char *zoo_active( void ); */
47 /* zoo_getname(): create a filename to use for the zoo
diff --git a/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-oe/recipes-support/mcelog/mce-test_git.bb
index 05e98e86ed..3b96210633 100644
--- a/meta-oe/recipes-support/mcelog/mce-test_git.bb
+++ b/meta-oe/recipes-support/mcelog/mce-test_git.bb
@@ -11,17 +11,17 @@ LICENSE = "GPL-2.0-only"
11LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" 11LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3"
12 12
13SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \ 13SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git;branch=master \
14 file://makefile-remove-ldflags.patch \ 14 file://makefile-remove-ldflags.patch \
15 file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ 15 file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \
16 " 16 file://0001-ltp-pan-fix-wait_handler-declaration.patch \
17SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" 17"
18PV = "20222810+git" 18SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b"
19PV = "20230601+git"
19 20
20RDEPENDS:${PN} = "mcelog mce-inject dialog bash" 21RDEPENDS:${PN} = "mcelog mce-inject dialog bash"
21 22
22COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 23COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
23 24
24S ="${WORKDIR}/git"
25 25
26EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" 26EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'"
27 27
diff --git a/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-oe/recipes-support/mcelog/mcelog_204.bb
index 0a48fc48ce..c3d082aa67 100644
--- a/meta-oe/recipes-support/mcelog/mcelog_199.bb
+++ b/meta-oe/recipes-support/mcelog/mcelog_204.bb
@@ -10,12 +10,11 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;;
10 file://run-ptest \ 10 file://run-ptest \
11 " 11 "
12 12
13SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" 13SRCREV = "ad244c6b60fcbd08a5d73497bfb3487983801598"
14 14
15LICENSE = "GPL-2.0-only" 15LICENSE = "GPL-2.0-only"
16LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" 16LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263"
17 17
18S = "${WORKDIR}/git"
19 18
20inherit ptest 19inherit ptest
21 20
diff --git a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
index 6c409666fc..59f2e430aa 100644
--- a/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
+++ b/meta-oe/recipes-support/md4c/md4c_0.5.2.bb
@@ -6,7 +6,6 @@ LICENSE = "MIT"
6LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378" 6LIC_FILES_CHKSUM = "file://LICENSE.md;md5=383f39920f391605af6e8e46e60e2378"
7 7
8 8
9S = "${WORKDIR}/git"
10 9
11SRC_URI = " \ 10SRC_URI = " \
12 git://github.com/mity/md4c.git;protocol=https;branch=master \ 11 git://github.com/mity/md4c.git;protocol=https;branch=master \
diff --git a/meta-oe/recipes-support/mg/mg_20230501.bb b/meta-oe/recipes-support/mg/mg_20230501.bb
index ee00003977..04811f1bdd 100644
--- a/meta-oe/recipes-support/mg/mg_20230501.bb
+++ b/meta-oe/recipes-support/mg/mg_20230501.bb
@@ -14,7 +14,6 @@ SRC_URI:append:libc-musl = "\
14 file://0001-Undefine-REGEX-for-musl-based-systems.patch \ 14 file://0001-Undefine-REGEX-for-musl-based-systems.patch \
15 " 15 "
16 16
17S = "${WORKDIR}/git"
18 17
19# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= 18# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?=
20EXTRA_OEMAKE = "\ 19EXTRA_OEMAKE = "\
diff --git a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
index 46def2a23c..1c0aec13e3 100644
--- a/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
+++ b/meta-oe/recipes-support/mime-support/mime-support_3.62.bb
@@ -12,7 +12,7 @@ RRECOMMENDS:${PN} = "file"
12 12
13SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz" 13SRC_URI = "${DEBIAN_MIRROR}/main/m/mime-support/mime-support_${PV}.tar.gz"
14SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a" 14SRC_URI[sha256sum] = "54e0a03e0cd63c7c9fe68a18ead0a2143fd3c327604215f989d85484d0409f4a"
15S = "${WORKDIR}/${BPN}" 15S = "${UNPACKDIR}/${BPN}"
16 16
17inherit update-alternatives 17inherit update-alternatives
18 18
diff --git a/meta-oe/recipes-support/minini/minini_1.2.b.bb b/meta-oe/recipes-support/minini/minini_1.2.b.bb
index 4a73f12129..582f183938 100644
--- a/meta-oe/recipes-support/minini/minini_1.2.b.bb
+++ b/meta-oe/recipes-support/minini/minini_1.2.b.bb
@@ -16,7 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=eb21481ad45c5578ae8c8d37b8c8d76d"
16 16
17SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/minini/minIni_12b.zip;subdir=${BP}" 17SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/minini/minIni_12b.zip;subdir=${BP}"
18 18
19SRC_URI[md5sum] = "32740621098e3f0a321c7c23f4bcbc5d"
20SRC_URI[sha256sum] = "b08839af74acb36061fb76e1123bf56711bc5cf7a08b32e189b0ad78a2e888e2" 19SRC_URI[sha256sum] = "b08839af74acb36061fb76e1123bf56711bc5cf7a08b32e189b0ad78a2e888e2"
21 20
22do_configure[noexec] = "1" 21do_configure[noexec] = "1"
diff --git a/meta-oe/recipes-support/monit/monit_5.34.0.bb b/meta-oe/recipes-support/monit/monit_5.35.2.bb
index 7c3869789c..97020d1953 100644
--- a/meta-oe/recipes-support/monit/monit_5.34.0.bb
+++ b/meta-oe/recipes-support/monit/monit_5.35.2.bb
@@ -6,8 +6,9 @@ causal actions in error situations."
6HOMEPAGE = "http://mmonit.com/monit/" 6HOMEPAGE = "http://mmonit.com/monit/"
7 7
8LICENSE = "AGPL-3.0-only" 8LICENSE = "AGPL-3.0-only"
9LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=79ca9f26f1ecb1e377e90383109ede64 \
10 file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" 10 file://libmonit/COPYING;md5=44aaa0a664332e9568add09f1ddb01cb \
11 "
11 12
12SRC_URI = " \ 13SRC_URI = " \
13 https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ 14 https://mmonit.com/monit/dist/monit-${PV}.tar.gz \
@@ -15,11 +16,14 @@ SRC_URI = " \
15 file://monitrc \ 16 file://monitrc \
16" 17"
17 18
18SRC_URI[sha256sum] = "37f514cd8973bbce104cb8517ff3fc504052a083703eee0d0e873db26b919820" 19SRC_URI[sha256sum] = "4dfef54329e63d9772a9e1c36ac99bc41173b79963dc0d8235f2c32f4b9e078f"
19 20
20DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" 21DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt"
21 22
22inherit autotools-brokensep systemd update-rc.d 23inherit autotools-brokensep systemd update-rc.d
24# brokensep because | ../../monit-5.34.4/libmonit/src/util/Str.c:26:10: fatal error: Config.h: No such file or directory
25
26EXTRA_AUTORECONF += "-I config"
23 27
24PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" 28PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
25PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" 29PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam"
@@ -38,10 +42,6 @@ INITSCRIPT_PACKAGES = "${PN}"
38INITSCRIPT_NAME:${PN} = "monit" 42INITSCRIPT_NAME:${PN} = "monit"
39INITSCRIPT_PARAMS:${PN} = "defaults 89" 43INITSCRIPT_PARAMS:${PN} = "defaults 89"
40 44
41do_configure:prepend() {
42 rm -rf ${S}/m4/*
43}
44
45do_install:append() { 45do_install:append() {
46 46
47 # Configuration file 47 # Configuration file
diff --git a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
index 371281d6e4..8b674db926 100644
--- a/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
+++ b/meta-oe/recipes-support/mscgen/mscgen_0.20.bb
@@ -6,9 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b1e6a340187c1cf716513439d07c1d79"
6 6
7SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" 7SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz"
8 8
9SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377"
10SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" 9SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23"
11 10
11UPSTREAM_CHECK_URI = "https://www.mcternan.me.uk//mscgen/"
12
12DEPENDS = "gd " 13DEPENDS = "gd "
13 14
14inherit autotools gettext pkgconfig 15inherit autotools gettext pkgconfig
diff --git a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
index b4f4651e37..4c68e7adf4 100644
--- a/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
+++ b/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb
@@ -11,6 +11,9 @@ SRC_URI = "https://github.com/msktutil/msktutil/releases/download/${PV}/${BP}.ta
11 file://0001-configure.ac-Remove-native-include-path.patch" 11 file://0001-configure.ac-Remove-native-include-path.patch"
12SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" 12SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d"
13 13
14UPSTREAM_CHECK_URI = "https://github.com/msktutil/msktutil/releases/"
15UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
16
14DEPENDS += "krb5 cyrus-sasl openldap" 17DEPENDS += "krb5 cyrus-sasl openldap"
15 18
16inherit autotools 19inherit autotools
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
index 74ae1530cb..909fd77ba2 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-RH-fixup-udev-rules-for-redhat.patch
@@ -1,7 +1,7 @@
1From 1e1ba9ecc16895bf472eae345d44631b65629611 Mon Sep 17 00:00:00 2001 1From 68160e86472b197107c60bf6e5a3d126040e85b6 Mon Sep 17 00:00:00 2001
2From: Benjamin Marzinski <bmarzins@redhat.com> 2From: Benjamin Marzinski <bmarzins@redhat.com>
3Date: Thu, 13 Apr 2017 07:22:23 -0500 3Date: Thu, 13 Apr 2017 07:22:23 -0500
4Subject: [PATCH 01/12] RH: fixup udev rules for redhat 4Subject: [PATCH] RH: fixup udev rules for redhat
5 5
6The multipath rules need to run after scsi_id is run. This means moving 6The multipath rules need to run after scsi_id is run. This means moving
7them after 60-persistent-storage.rules for redhat. Redhat also uses a 7them after 60-persistent-storage.rules for redhat. Redhat also uses a
@@ -18,17 +18,20 @@ Rebase to 0.9.8
18Signed-off-by: Changqing Li <changqing.li@windriver.com> 18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19 19
20Upstream-Status: Pending 20Upstream-Status: Pending
21
22Rebase to 0.10.0
23Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
21--- 24---
22 Makefile.inc | 2 +- 25 Makefile.inc | 2 +-
23 kpartx/kpartx.rules | 2 +- 26 kpartx/kpartx.rules.in | 2 +-
24 multipath/Makefile | 4 ++-- 27 multipath/Makefile | 4 ++--
25 3 files changed, 4 insertions(+), 4 deletions(-) 28 3 files changed, 4 insertions(+), 4 deletions(-)
26 29
27diff --git a/Makefile.inc b/Makefile.inc 30diff --git a/Makefile.inc b/Makefile.inc
28index 5668e638..de89b21f 100644 31index 729618bd..69521882 100644
29--- a/Makefile.inc 32--- a/Makefile.inc
30+++ b/Makefile.inc 33+++ b/Makefile.inc
31@@ -59,7 +59,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d 34@@ -62,7 +62,7 @@ tmpfilesdir := $(systemd_prefix)lib/tmpfiles.d
32 modulesloaddir := $(systemd_prefix)lib/modules-load.d 35 modulesloaddir := $(systemd_prefix)lib/modules-load.d
33 libudevdir := $(systemd_prefix)lib/udev 36 libudevdir := $(systemd_prefix)lib/udev
34 udevrulesdir := $(libudevdir)/rules.d 37 udevrulesdir := $(libudevdir)/rules.d
@@ -37,16 +40,16 @@ index 5668e638..de89b21f 100644
37 mandir := $(usr_prefix)share/man 40 mandir := $(usr_prefix)share/man
38 LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib) 41 LIB := $(if $(shell test -d /lib64 && echo 1),lib64,lib)
39 syslibdir := $(prefix)$(LIB) 42 syslibdir := $(prefix)$(LIB)
40diff --git a/kpartx/kpartx.rules b/kpartx/kpartx.rules 43diff --git a/kpartx/kpartx.rules.in b/kpartx/kpartx.rules.in
41index 1969dee0..d2b28233 100644 44index 9d879609..2049eb8f 100644
42--- a/kpartx/kpartx.rules 45--- a/kpartx/kpartx.rules.in
43+++ b/kpartx/kpartx.rules 46+++ b/kpartx/kpartx.rules.in
44@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end" 47@@ -39,6 +39,6 @@ LABEL="mpath_kpartx_end"
45 GOTO="kpartx_end" 48 GOTO="kpartx_end"
46 49
47 LABEL="run_kpartx" 50 LABEL="run_kpartx"
48-RUN+="/sbin/kpartx -un -p -part /dev/$name" 51-RUN+="@BINDIR@/kpartx -un -p -part /dev/$name"
49+RUN+="/sbin/kpartx -un /dev/$name" 52+RUN+="@BINDIR@/kpartx -un /dev/$name"
50 53
51 LABEL="kpartx_end" 54 LABEL="kpartx_end"
52diff --git a/multipath/Makefile b/multipath/Makefile 55diff --git a/multipath/Makefile b/multipath/Makefile
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
new file mode 100644
index 0000000000..128a0c4d8d
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch
@@ -0,0 +1,28 @@
1From 1d444772db14f4acb8d47b874462b0cc171ab672 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 17 Feb 2025 12:01:59 -0800
4Subject: [PATCH] libmpathutils/uxsock.c: Include string.h for memcpy
5
6Fixes
7uxsock.c:72:2: error: call to undeclared library function 'memcpy' with type 'void *(void *, const void *, unsigned long)'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
8
9Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250217200503.4166910-1-raj.khem@gmail.com/T/#u]
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11Cc: Benjamin Marzinski <bmarzins@redhat.com>
12Cc: Martin Wilck <mwilck@suse.com>
13---
14 libmpathutil/uxsock.c | 1 +
15 1 file changed, 1 insertion(+)
16
17diff --git a/libmpathutil/uxsock.c b/libmpathutil/uxsock.c
18index 2135476d..a474874e 100644
19--- a/libmpathutil/uxsock.c
20+++ b/libmpathutil/uxsock.c
21@@ -8,6 +8,7 @@
22 #include <stdlib.h>
23 #include <unistd.h>
24 #include <stdarg.h>
25+#include <string.h>
26 #include <fcntl.h>
27 #include <sys/ioctl.h>
28 #include <sys/types.h>
diff --git a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch b/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
deleted file mode 100644
index 0365a7ef64..0000000000
--- a/meta-oe/recipes-support/multipath-tools/files/0001-libmultipath-always-use-glibc-basename.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From 389286b25a903be62ce7f964246824fcc20c4c67 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 26 Mar 2024 18:56:55 -0700
4Subject: [PATCH] libmultipath: always use glibc basename()
5
6There is a use of basename() which expects it to be GNU version of
7basename, which is not available in other libcs e.g. musl on Linux
8therefore provide a version for such cases
9
10Upstream-Status: Submitted [https://github.com/opensvc/multipath-tools/pull/84]
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 libmultipath/configure.c | 13 +++++++++++++
14 1 file changed, 13 insertions(+)
15
16diff --git a/libmultipath/configure.c b/libmultipath/configure.c
17index 4ecf6ba4..e81cc67c 100644
18--- a/libmultipath/configure.c
19+++ b/libmultipath/configure.c
20@@ -43,6 +43,19 @@
21 #include "sysfs.h"
22 #include "io_err_stat.h"
23
24+#ifndef __GLIBC__
25+/*
26+ * glibc's non-destructive version of basename()
27+ * License: LGPL-2.1-or-later
28+ */
29+static const char *__basename(const char *filename)
30+{
31+ char *p = strrchr(filename, '/');
32+ return p ? p + 1 : filename;
33+}
34+#define basename(x) __basename(x)
35+#endif
36+
37 /* group paths in pg by host adapter
38 */
39 int group_by_host_adapter(struct pathgroup *pgp, vector adapters)
40--
412.44.0
42
diff --git a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
index 4b24bd2d35..a578280491 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0002-RH-Remove-the-property-blacklist-exception-builtin.patch
@@ -1,7 +1,7 @@
1From bb6db01cc19940bb5162c1cc0c9b5f8e4c209822 Mon Sep 17 00:00:00 2001 1From e3449e163d7fe9bf1e188f0e28962f0659e9652d Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 1 Mar 2024 10:34:06 +0800 3Date: Fri, 1 Mar 2024 10:34:06 +0800
4Subject: [PATCH 02/12] RH: Remove the property blacklist exception builtin 4Subject: [PATCH] RH: Remove the property blacklist exception builtin
5 5
6Multipath set the default property blacklist exceptions to 6Multipath set the default property blacklist exceptions to
7(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal 7(ID_SCSI_VPD|ID_WWN). This has the effect of blacklisting some internal
@@ -13,21 +13,19 @@ it.
13 13
14Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com> 14Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
15 15
16Upsteam-Status: Pending 16Upstream-Status: Pending
17 17
18[OP: Rebase to 0.9.3] 18[OP: Rebase to 0.9.3]
19Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com> 19Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
20 20
21Rebase to 0.9.8 21Rebase to 0.9.8
22Signed-off-by: Changqing Li <changqing.li@windriver.com> 22Signed-off-by: Changqing Li <changqing.li@windriver.com>
23
24Upstream-Status: Pending
25--- 23---
26 libmultipath/blacklist.c | 16 +++++----------- 24 libmultipath/blacklist.c | 16 +++++-----------
27 1 file changed, 5 insertions(+), 11 deletions(-) 25 1 file changed, 5 insertions(+), 11 deletions(-)
28 26
29diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c 27diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c
30index 75100b20..4fdaca76 100644 28index 17e1b54a..2cfb18b8 100644
31--- a/libmultipath/blacklist.c 29--- a/libmultipath/blacklist.c
32+++ b/libmultipath/blacklist.c 30+++ b/libmultipath/blacklist.c
33@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf) 31@@ -221,15 +221,6 @@ setup_default_blist (struct config * conf)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
index 54b3bdc863..649f1fa778 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0003-RH-don-t-start-without-a-config-file.patch
@@ -1,7 +1,7 @@
1From de8ee3480ec7479ed014c197a9d747403f6e0237 Mon Sep 17 00:00:00 2001 1From 2fe1037b8198bd00961d8df48e684296758127d1 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 23 Nov 2018 17:25:15 +0800 3Date: Fri, 23 Nov 2018 17:25:15 +0800
4Subject: [PATCH 03/12] RH: don't start without a config file 4Subject: [PATCH] RH: don't start without a config file
5 5
6If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist 6If /etc/multipath.conf doesn't exist, don't start multipathd and blacklist
7all devices when running multipath. A completely blank configuration file 7all devices when running multipath. A completely blank configuration file
@@ -28,7 +28,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
28 5 files changed, 23 insertions(+) 28 5 files changed, 23 insertions(+)
29 29
30diff --git a/libmultipath/config.c b/libmultipath/config.c 30diff --git a/libmultipath/config.c b/libmultipath/config.c
31index 83fa7369..8a3a8f37 100644 31index 8b424d18..d8fafa1f 100644
32--- a/libmultipath/config.c 32--- a/libmultipath/config.c
33+++ b/libmultipath/config.c 33+++ b/libmultipath/config.c
34@@ -26,6 +26,7 @@ 34@@ -26,6 +26,7 @@
@@ -39,7 +39,7 @@ index 83fa7369..8a3a8f37 100644
39 39
40 /* 40 /*
41 * We don't support re-initialization after 41 * We don't support re-initialization after
42@@ -959,6 +960,23 @@ int _init_config (const char *file, struct config *conf) 42@@ -937,6 +938,23 @@ int init_config__ (const char *file, struct config *conf)
43 } 43 }
44 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file); 44 factorize_hwtable(conf->hwtable, builtin_hwtable_size, file);
45 validate_pctable(conf->overrides, 0, file); 45 validate_pctable(conf->overrides, 0, file);
@@ -64,7 +64,7 @@ index 83fa7369..8a3a8f37 100644
64 64
65 conf->processed_main_config = 1; 65 conf->processed_main_config = 1;
66diff --git a/libmultipath/config.h b/libmultipath/config.h 66diff --git a/libmultipath/config.h b/libmultipath/config.h
67index 384193ab..158cebf0 100644 67index 5b4ebf8c..2302eacc 100644
68--- a/libmultipath/config.h 68--- a/libmultipath/config.h
69+++ b/libmultipath/config.h 69+++ b/libmultipath/config.h
70@@ -10,6 +10,7 @@ 70@@ -10,6 +10,7 @@
@@ -76,7 +76,7 @@ index 384193ab..158cebf0 100644
76 enum devtypes { 76 enum devtypes {
77 DEV_NONE, 77 DEV_NONE,
78diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in 78diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in
79index 780bf852..2c518378 100644 79index 2ac1972f..cc248231 100644
80--- a/multipath/multipath.rules.in 80--- a/multipath/multipath.rules.in
81+++ b/multipath/multipath.rules.in 81+++ b/multipath/multipath.rules.in
82@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath" 82@@ -9,6 +9,7 @@ IMPORT{cmdline}="nompath"
@@ -88,7 +88,7 @@ index 780bf852..2c518378 100644
88 ENV{DEVTYPE}!="partition", GOTO="test_dev" 88 ENV{DEVTYPE}!="partition", GOTO="test_dev"
89 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH" 89 IMPORT{parent}="DM_MULTIPATH_DEVICE_PATH"
90diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in 90diff --git a/multipathd/multipathd.8.in b/multipathd/multipathd.8.in
91index f1cab3ff..5ae21db1 100644 91index 7bc8806e..315884eb 100644
92--- a/multipathd/multipathd.8.in 92--- a/multipathd/multipathd.8.in
93+++ b/multipathd/multipathd.8.in 93+++ b/multipathd/multipathd.8.in
94@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy. 94@@ -49,6 +49,8 @@ map regains its maximum performance and redundancy.
@@ -101,7 +101,7 @@ index f1cab3ff..5ae21db1 100644
101 . 101 .
102 .\" ---------------------------------------------------------------------------- 102 .\" ----------------------------------------------------------------------------
103diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in 103diff --git a/multipathd/multipathd.service.in b/multipathd/multipathd.service.in
104index 6d03ff71..0cd85102 100644 104index b6a25b31..f78bb91b 100644
105--- a/multipathd/multipathd.service.in 105--- a/multipathd/multipathd.service.in
106+++ b/multipathd/multipathd.service.in 106+++ b/multipathd/multipathd.service.in
107@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target 107@@ -5,6 +5,7 @@ Before=local-fs-pre.target blk-availability.service shutdown.target
@@ -112,6 +112,3 @@ index 6d03ff71..0cd85102 100644
112 Before=initrd-cleanup.service 112 Before=initrd-cleanup.service
113 DefaultDependencies=no 113 DefaultDependencies=no
114 Conflicts=shutdown.target 114 Conflicts=shutdown.target
115--
1162.25.1
117
diff --git a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
index 91477a44cb..6556d4af85 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0004-RH-use-rpm-optflags-if-present.patch
@@ -1,7 +1,7 @@
1From f1b74f21875d6d9f0a5ac3d67df40a28b167052a Mon Sep 17 00:00:00 2001 1From dd4f005ab3b38cee2776dcb0a0661c5a01befd00 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 09:19:17 +0800 3Date: Mon, 26 Nov 2018 09:19:17 +0800
4Subject: [PATCH 04/12] RH: use rpm optflags if present 4Subject: [PATCH] RH: use rpm optflags if present
5 5
6Use the passed in optflags when compiling as an RPM, and keep the 6Use the passed in optflags when compiling as an RPM, and keep the
7default flags as close as possible to the current fedora flags, while 7default flags as close as possible to the current fedora flags, while
@@ -16,15 +16,18 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
16 16
17Rebase to 0.9.8 17Rebase to 0.9.8
18Signed-off-by: Changqing Li <changqing.li@windriver.com> 18Signed-off-by: Changqing Li <changqing.li@windriver.com>
19
20Rebase to 0.10.0
21Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
19--- 22---
20 Makefile.inc | 12 ++++++++++-- 23 Makefile.inc | 12 ++++++++++--
21 1 file changed, 10 insertions(+), 2 deletions(-) 24 1 file changed, 10 insertions(+), 2 deletions(-)
22 25
23diff --git a/Makefile.inc b/Makefile.inc 26diff --git a/Makefile.inc b/Makefile.inc
24index de89b21f..6ac632ff 100644 27index 69521882..2127f208 100644
25--- a/Makefile.inc 28--- a/Makefile.inc
26+++ b/Makefile.inc 29+++ b/Makefile.inc
27@@ -95,7 +95,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo 30@@ -99,7 +99,15 @@ SYSTEMD_LIBDEPS := $(if $(SYSTEMD),$(if $(shell test $(SYSTEMD) -gt 209 && echo
28 MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \ 31 MODPROBE_UNIT := $(shell test "0$(SYSTEMD)" -lt 245 2>/dev/null || \
29 echo "modprobe@dm_multipath.service") 32 echo "modprobe@dm_multipath.service")
30 33
@@ -38,18 +41,18 @@ index de89b21f..6ac632ff 100644
38+ -Werror=implicit-function-declaration -Wno-sign-compare \ 41+ -Werror=implicit-function-declaration -Wno-sign-compare \
39+ -Wno-unused-parameter -Werror=cast-qual \ 42+ -Wno-unused-parameter -Werror=cast-qual \
40+ -Werror=discarded-qualifiers 43+ -Werror=discarded-qualifiers
41 WARNFLAGS := -Werror -Wall -Wextra -Wformat=2 $(WFORMATOVERFLOW) -Werror=implicit-int \ 44
42 -Werror=implicit-function-declaration -Werror=format-security \ 45 # Set WARN_ONLY=1 to avoid compilation erroring out due to warnings. Useful during development.
43 $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS) $(W_URCU_TYPE_LIMITS) 46 WARN_ONLY :=
44@@ -105,7 +113,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \ 47@@ -115,7 +123,7 @@ CPPFLAGS := $(FORTIFY_OPT) $(CPPFLAGS) $(D_URCU_VERSION) \
45 -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(configdir)\" \ 48 -DRUNTIME_DIR=\"$(runtimedir)\" -DCONFIG_DIR=\"$(TGTDIR)$(configdir)\" \
46 -DDEFAULT_CONFIGFILE=\"$(configfile)\" -DSTATE_DIR=\"$(statedir)\" \ 49 -DDEFAULT_CONFIGFILE=\"$(TGTDIR)$(configfile)\" -DSTATE_DIR=\"$(TGTDIR)$(statedir)\" \
47 -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP 50 -DEXTRAVERSION=\"$(EXTRAVERSION)\" -MMD -MP
48-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe 51-CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
49+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe 52+CFLAGS := -std=gnu99 $(CFLAGS) $(OPTFLAGS) -pipe \
53 -fexceptions
50 BIN_CFLAGS := -fPIE -DPIE 54 BIN_CFLAGS := -fPIE -DPIE
51 LIB_CFLAGS := -fPIC 55 LIB_CFLAGS := -fPIC
52 SHARED_FLAGS := -shared
53-- 56--
542.25.1 572.25.1
55 58
diff --git a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
index c6089612b3..e7ea374cd1 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0005-RH-add-mpathconf.patch
@@ -1,7 +1,7 @@
1From 8f52504859704466667e042baf437c2b6272ffb9 Mon Sep 17 00:00:00 2001 1From 4035b48b512b5010b1c33aeba8c58cf2705bca83 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 09:55:12 +0800 3Date: Mon, 26 Nov 2018 09:55:12 +0800
4Subject: [PATCH 05/12] RH: add mpathconf 4Subject: [PATCH] RH: add mpathconf
5 5
6mpathconf is a program (largely based on lvmcomf) to help users 6mpathconf is a program (largely based on lvmcomf) to help users
7configure /etc/multipath.conf and enable or disable multipathing. It 7configure /etc/multipath.conf and enable or disable multipathing. It
@@ -29,10 +29,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
29 create mode 100644 multipath/mpathconf.8 29 create mode 100644 multipath/mpathconf.8
30 30
31diff --git a/libmultipath/config.c b/libmultipath/config.c 31diff --git a/libmultipath/config.c b/libmultipath/config.c
32index 8a3a8f37..a40b41ab 100644 32index d8fafa1f..cba7994b 100644
33--- a/libmultipath/config.c 33--- a/libmultipath/config.c
34+++ b/libmultipath/config.c 34+++ b/libmultipath/config.c
35@@ -962,6 +962,7 @@ int _init_config (const char *file, struct config *conf) 35@@ -940,6 +940,7 @@ int init_config__ (const char *file, struct config *conf)
36 validate_pctable(conf->overrides, 0, file); 36 validate_pctable(conf->overrides, 0, file);
37 } else { 37 } else {
38 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices."); 38 condlog(0, "/etc/multipath.conf does not exist, blacklisting all devices.");
@@ -648,6 +648,3 @@ index 00000000..4cd32672
648+.BR service (8), 648+.BR service (8),
649+.SH AUTHOR 649+.SH AUTHOR
650+Benjamin Marzinski <bmarzins@redhat.com> 650+Benjamin Marzinski <bmarzins@redhat.com>
651--
6522.25.1
653
diff --git a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
index 8df7de3b48..04160eaac5 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0006-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch
@@ -1,7 +1,7 @@
1From f93248d8e3598ccdc42b6d639107917c9cda268c Mon Sep 17 00:00:00 2001 1From bd65cdc704666dd4153779c74cdbb2cac6efea71 Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Thu, 26 Sep 2019 16:29:48 +0800 3Date: Thu, 26 Sep 2019 16:29:48 +0800
4Subject: [PATCH 06/12] RH: add wwids from kernel cmdline mpath.wwids with -A 4Subject: [PATCH] RH: add wwids from kernel cmdline mpath.wwids with -A
5 5
6This patch adds another option to multipath, "-A", which reads 6This patch adds another option to multipath, "-A", which reads
7/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds 7/proc/cmdline for mpath.wwid=<WWID> options, and adds any wwids it finds
@@ -27,7 +27,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
27 2 files changed, 45 insertions(+) 27 2 files changed, 45 insertions(+)
28 28
29diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c 29diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
30index 591cd09b..b01f1b85 100644 30index aac18c04..68f8e373 100644
31--- a/libmultipath/wwids.c 31--- a/libmultipath/wwids.c
32+++ b/libmultipath/wwids.c 32+++ b/libmultipath/wwids.c
33@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid) 33@@ -439,3 +439,47 @@ int unmark_failed_wwid(const char *wwid)
@@ -79,7 +79,7 @@ index 591cd09b..b01f1b85 100644
79+ return ret; 79+ return ret;
80+} 80+}
81diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h 81diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h
82index 0c6ee54d..e32a0b0e 100644 82index ee47ad9f..1ed0d85e 100644
83--- a/libmultipath/wwids.h 83--- a/libmultipath/wwids.h
84+++ b/libmultipath/wwids.h 84+++ b/libmultipath/wwids.h
85@@ -17,6 +17,7 @@ int remember_wwid(char *wwid); 85@@ -17,6 +17,7 @@ int remember_wwid(char *wwid);
diff --git a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
index c64b8aeabc..b435e6d677 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0007-RH-warn-on-invalid-regex-instead-of-failing.patch
@@ -1,7 +1,7 @@
1From 49d0b0279f54ceb96878e8e72e828efbb84a534c Mon Sep 17 00:00:00 2001 1From 9f1075f82ecd39a9960f868eef890baf2ba36d4e Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Fri, 1 Mar 2024 11:45:10 +0800 3Date: Fri, 1 Mar 2024 11:45:10 +0800
4Subject: [PATCH 07/12] RH: warn on invalid regex instead of failing 4Subject: [PATCH] RH: warn on invalid regex instead of failing
5 5
6multipath.conf used to allow "*" as a match everything regular expression, 6multipath.conf used to allow "*" as a match everything regular expression,
7instead of requiring ".*". Instead of erroring when the old style 7instead of requiring ".*". Instead of erroring when the old style
@@ -23,7 +23,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
23 1 file changed, 34 insertions(+), 6 deletions(-) 23 1 file changed, 34 insertions(+), 6 deletions(-)
24 24
25diff --git a/libmultipath/dict.c b/libmultipath/dict.c 25diff --git a/libmultipath/dict.c b/libmultipath/dict.c
26index 5af036b7..e494419d 100644 26index a06a6138..a734ba9b 100644
27--- a/libmultipath/dict.c 27--- a/libmultipath/dict.c
28+++ b/libmultipath/dict.c 28+++ b/libmultipath/dict.c
29@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr) 29@@ -189,6 +189,34 @@ set_str_noslash(vector strvec, void *ptr, const char *file, int line_nr)
@@ -61,7 +61,7 @@ index 5af036b7..e494419d 100644
61 static int 61 static int
62 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr) 62 set_yes_no(vector strvec, void *ptr, const char *file, int line_nr)
63 { 63 {
64@@ -1798,7 +1826,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \ 64@@ -1854,7 +1882,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec, \
65 if (!conf->option) \ 65 if (!conf->option) \
66 return 1; \ 66 return 1; \
67 \ 67 \
@@ -70,7 +70,7 @@ index 5af036b7..e494419d 100644
70 if (!buff) \ 70 if (!buff) \
71 return 1; \ 71 return 1; \
72 \ 72 \
73@@ -1818,7 +1846,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \ 73@@ -1874,7 +1902,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec, \
74 if (!conf->option) \ 74 if (!conf->option) \
75 return 1; \ 75 return 1; \
76 \ 76 \
@@ -79,7 +79,7 @@ index 5af036b7..e494419d 100644
79 if (!buff) \ 79 if (!buff) \
80 return 1; \ 80 return 1; \
81 \ 81 \
82@@ -1924,16 +1952,16 @@ device_handler(struct config *conf, vector strvec, const char *file, 82@@ -1980,16 +2008,16 @@ device_handler(struct config *conf, vector strvec, const char *file,
83 return 0; 83 return 0;
84 } 84 }
85 85
diff --git a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
index 1fa1f3be27..9ea255cbcb 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0008-RH-reset-default-find_mutipaths-value-to-off.patch
@@ -1,7 +1,7 @@
1From fcba3e0d4c8448a2510025acb255c7335413bf56 Mon Sep 17 00:00:00 2001 1From 87e19d273c46fe78933627fc4e8046e3a76da47a Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 11:12:01 +0800 3Date: Mon, 26 Nov 2018 11:12:01 +0800
4Subject: [PATCH 08/12] RH: reset default find_mutipaths value to off 4Subject: [PATCH] RH: reset default find_mutipaths value to off
5 5
6Upstream has changed to default find_multipaths to "strict". For now 6Upstream has changed to default find_multipaths to "strict". For now
7Redhat will retain the previous default of "off". 7Redhat will retain the previous default of "off".
@@ -17,10 +17,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
17 1 file changed, 1 insertion(+), 1 deletion(-) 17 1 file changed, 1 insertion(+), 1 deletion(-)
18 18
19diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h 19diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
20index 64b633f2..a06a8a41 100644 20index 02f7e57c..98dd66f7 100644
21--- a/libmultipath/defaults.h 21--- a/libmultipath/defaults.h
22+++ b/libmultipath/defaults.h 22+++ b/libmultipath/defaults.h
23@@ -23,7 +23,7 @@ 23@@ -24,7 +24,7 @@
24 #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF 24 #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF
25 #define DEFAULT_VERBOSITY 2 25 #define DEFAULT_VERBOSITY 2
26 #define DEFAULT_REASSIGN_MAPS 0 26 #define DEFAULT_REASSIGN_MAPS 0
diff --git a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
index 041b79a9af..661e38f684 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0009-multipath-tools-modify-create-config.mk-for-cross-co.patch
@@ -1,7 +1,7 @@
1From 7452549e572b1c40aefe25524bf4bbbf34c952e5 Mon Sep 17 00:00:00 2001 1From c22c897e7c55fc0b8c5bdd113a0357654ee895ae Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Tue, 4 Jun 2019 11:39:39 +0800 3Date: Tue, 4 Jun 2019 11:39:39 +0800
4Subject: [PATCH 09/12] multipath-tools: modify create-config.mk for 4Subject: [PATCH] multipath-tools: modify create-config.mk for
5 cross-compilation 5 cross-compilation
6 6
7Do not look for systemd info on the host, and allow us to pass in CFLAGS 7Do not look for systemd info on the host, and allow us to pass in CFLAGS
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 1 file changed, 4 deletions(-) 21 1 file changed, 4 deletions(-)
22 22
23diff --git a/create-config.mk b/create-config.mk 23diff --git a/create-config.mk b/create-config.mk
24index 4d318b96..a65975ba 100644 24index 8bd2c20c..40d2446a 100644
25--- a/create-config.mk 25--- a/create-config.mk
26+++ b/create-config.mk 26+++ b/create-config.mk
27@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0) 27@@ -127,10 +127,6 @@ ifeq ($(ENABLE_DMEVENTS_POLL),0)
diff --git a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
index b48720b8a1..cf053680f6 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0010-Subject-PATCH-Always-use-devmapper.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0010-Always-use-devmapper.patch
@@ -1,7 +1,7 @@
1From 5d2fa3c5975266a6c02214afa6254e6eeeb1baad Mon Sep 17 00:00:00 2001 1From c34c65a3f5ddec22cb417872f90c2c9540a1847b Mon Sep 17 00:00:00 2001
2From: Changqing Li <changqing.li@windriver.com> 2From: Changqing Li <changqing.li@windriver.com>
3Date: Mon, 26 Nov 2018 11:17:41 +0800 3Date: Mon, 26 Nov 2018 11:17:41 +0800
4Subject: [PATCH 10/12] Subject: [PATCH] Always use devmapper 4Subject: [PATCH] Always use devmapper
5 5
6Do not try to compute several _API_ make variables 6Do not try to compute several _API_ make variables
7from host information when cross-compiling. 7from host information when cross-compiling.
@@ -21,7 +21,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
21 1 file changed, 8 insertions(+), 28 deletions(-) 21 1 file changed, 8 insertions(+), 28 deletions(-)
22 22
23diff --git a/create-config.mk b/create-config.mk 23diff --git a/create-config.mk b/create-config.mk
24index a65975ba..8ba592f4 100644 24index 40d2446a..f5eb2803 100644
25--- a/create-config.mk 25--- a/create-config.mk
26+++ b/create-config.mk 26+++ b/create-config.mk
27@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \ 27@@ -79,34 +79,14 @@ URCU_VERSION = $(shell \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
index abaea2cfb6..0c5015142c 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0011-fix-bug-of-do_compile-and-do_install.patch
@@ -1,7 +1,7 @@
1From 949070286692dfff89213792571da233fe82e440 Mon Sep 17 00:00:00 2001 1From 698361847e6fae321bc277a5fc518b2bd55751b8 Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@cn.fujitsu.com> 2From: Wang Mingyu <wangmy@cn.fujitsu.com>
3Date: Sun, 10 May 2020 21:22:53 +0800 3Date: Sun, 10 May 2020 21:22:53 +0800
4Subject: [PATCH 11/12] fix bug of do_compile and do_install 4Subject: [PATCH] fix bug of do_compile and do_install
5 5
6when multiple processes make run in parallel, 6when multiple processes make run in parallel,
7because of dependency error will occur. 7because of dependency error will occur.
@@ -18,10 +18,10 @@ Upstream-Status: Pending
18 1 file changed, 10 insertions(+) 18 1 file changed, 10 insertions(+)
19 19
20diff --git a/Makefile b/Makefile 20diff --git a/Makefile b/Makefile
21index 4df5f161..065249c2 100644 21index f06f7faa..690dc050 100644
22--- a/Makefile 22--- a/Makefile
23+++ b/Makefile 23+++ b/Makefile
24@@ -91,6 +91,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath 24@@ -94,6 +94,16 @@ libmpathpersist libmpathvalid multipath multipathd: libmultipath
25 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath 25 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
26 mpathpersist multipathd: libmpathpersist 26 mpathpersist multipathd: libmpathpersist
27 27
diff --git a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
index 2f774940d6..f47d8afe4b 100644
--- a/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
+++ b/meta-oe/recipes-support/multipath-tools/files/0012-add-explicit-dependency-on-libraries.patch
@@ -1,7 +1,7 @@
1From 7a46f43682641436464579d8bf76c382e71ea557 Mon Sep 17 00:00:00 2001 1From 69ee17207574ca032c3cb46a3db99736de3eedf8 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Mon, 25 May 2020 23:22:55 -0700 3Date: Mon, 25 May 2020 23:22:55 -0700
4Subject: [PATCH 12/12] add explicit dependency on libraries 4Subject: [PATCH] add explicit dependency on libraries
5 5
6[snip] 6[snip]
7gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist 7gcc/i686-overc-linux/10.1.0/ld: cannot find -lmpathpersist
@@ -24,10 +24,10 @@ Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
24 1 file changed, 1 insertion(+) 24 1 file changed, 1 insertion(+)
25 25
26diff --git a/Makefile b/Makefile 26diff --git a/Makefile b/Makefile
27index 065249c2..0444c2ea 100644 27index 690dc050..b775f949 100644
28--- a/Makefile 28--- a/Makefile
29+++ b/Makefile 29+++ b/Makefile
30@@ -90,6 +90,7 @@ libmultipath: libmpathutil 30@@ -93,6 +93,7 @@ libmultipath: libmpathutil
31 libmpathpersist libmpathvalid multipath multipathd: libmultipath 31 libmpathpersist libmpathvalid multipath multipathd: libmultipath
32 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath 32 libmultipath/prioritizers libmultipath/checkers libmultipath/foreign: libmultipath
33 mpathpersist multipathd: libmpathpersist 33 mpathpersist multipathd: libmpathpersist
diff --git a/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
new file mode 100644
index 0000000000..4cca7decb8
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch
@@ -0,0 +1,29 @@
1From bcb052a8dadbd0a837986b1e15924b469fc59edc Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Thu, 3 Apr 2025 10:08:49 +0200
4Subject: [PATCH] libdmmp/Makefile: Fix KBUILD_BUILD_TIMESTAMP usage
5
6Add missing $ (Makefile need to escape '$' as '$$')
7
8Upstream-Status: Submitted [https://lore.kernel.org/dm-devel/20250404122902.2750036-1-sofiane.hamam@smile.fr/]
9
10Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
11Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
12Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
13---
14 libdmmp/Makefile | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/libdmmp/Makefile b/libdmmp/Makefile
18index 172ba045..7e0e2509 100644
19--- a/libdmmp/Makefile
20+++ b/libdmmp/Makefile
21@@ -74,7 +74,7 @@ doc: docs/man/dmmp_strerror.3
22 docs/man/dmmp_strerror.3: $(HEADERS)
23 $(Q)TEMPFILE=$(shell mktemp); \
24 cat $^ | perl docs/doc-preclean.pl >$$TEMPFILE; \
25- [ "$KBUILD_BUILD_TIMESTAMP" ] || \
26+ [ "$$KBUILD_BUILD_TIMESTAMP" ] || \
27 KBUILD_BUILD_TIMESTAMP=`git log -n1 --pretty=%cd --date=iso -- $^`; \
28 export KBUILD_BUILD_TIMESTAMP; \
29 LC_ALL=C \
diff --git a/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
new file mode 100644
index 0000000000..aad46c229b
--- /dev/null
+++ b/meta-oe/recipes-support/multipath-tools/files/0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch
@@ -0,0 +1,41 @@
1From 6e231d887c20b2139db75e6dc6c20107273aaacd Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?K=C3=A9l=C3=A9fa=20San=C3=A9?= <kelefa.sane@smile.fr>
3Date: Thu, 3 Apr 2025 10:25:30 +0200
4Subject: [PATCH] libdmmp/Makefile: Add target docs/man/dmmp_strerror.3 to
5 .PHONY list
6
7When cloning git repos, depending on the order of written to the disk, target
8docs/man/dmmp_strerror.3 is more recent that the prerequisite
9libdmmp/libdmmp.h this leads to a non reproducible behavior:
10Sometimes, the timestamps are updated in the man pages, sometimes not.
11
12Upstream-Status: Denied
13
14https://lore.kernel.org/dm-devel/72355f1d0984647e91f8c50f1c2295071af49e33.camel@suse.com/
15The patch has been rejected by upstream, who will update the timestamps of the
16manpages with a new commit.
17In order to be reproducible without having a random result, forcing the target
18rebuild by adding it to .PHONY is the more acceptable solution, the alternative
19would have been to use the make -B option which consider all target has
20obsolete and rebuild them all, which is less efficient.
21
22Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
23Signed-off-by: Sofiane HAMAM <sofiane.hamam@smile.fr>
24Signed-off-by: Kelefa Sane <kelefa.sane@smile.fr>
25---
26 libdmmp/Makefile | 2 +-
27 1 file changed, 1 insertion(+), 1 deletion(-)
28
29diff --git a/libdmmp/Makefile b/libdmmp/Makefile
30index 7e0e2509..187bcb8c 100644
31--- a/libdmmp/Makefile
32+++ b/libdmmp/Makefile
33@@ -20,7 +20,7 @@ CFLAGS += $(LIB_CFLAGS) -fvisibility=hidden
34 LIBDEPS += $(shell $(PKG_CONFIG) --libs json-c) -L$(mpathcmddir) -lmpathcmd -lpthread
35
36 all: $(LIBS) doc
37-.PHONY: doc clean install uninstall check speed_test dep_clean
38+.PHONY: doc clean install uninstall check speed_test dep_clean docs/man/dmmp_strerror.3
39
40 $(LIBS): $(OBJS)
41 $(Q)$(CC) $(LDFLAGS) $(SHARED_FLAGS) -Wl,-soname=$@ -o $@ $(OBJS) $(LIBDEPS)
diff --git a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
index 3bdf875e3c..3bdf875e3c 100755..100644
--- a/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
+++ b/meta-oe/recipes-support/multipath-tools/files/multipathd.oe
diff --git a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
index 374cda3b4e..07bc84ce8b 100644
--- a/meta-oe/recipes-support/multipath-tools/multipath-tools_0.9.8.bb
+++ b/meta-oe/recipes-support/multipath-tools/multipath-tools_0.11.1.bb
@@ -29,7 +29,7 @@ DEPENDS = "libdevmapper \
29 29
30LICENSE = "GPL-2.0-only" 30LICENSE = "GPL-2.0-only"
31 31
32SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=master \ 32SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=stable-0.11.y \
33 file://multipathd.oe \ 33 file://multipathd.oe \
34 file://multipath.conf.example \ 34 file://multipath.conf.example \
35 file://0001-RH-fixup-udev-rules-for-redhat.patch \ 35 file://0001-RH-fixup-udev-rules-for-redhat.patch \
@@ -41,17 +41,18 @@ SRC_URI = "git://github.com/opensvc/multipath-tools.git;protocol=https;branch=ma
41 file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \ 41 file://0007-RH-warn-on-invalid-regex-instead-of-failing.patch \
42 file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \ 42 file://0008-RH-reset-default-find_mutipaths-value-to-off.patch \
43 file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \ 43 file://0009-multipath-tools-modify-create-config.mk-for-cross-co.patch \
44 file://0010-Subject-PATCH-Always-use-devmapper.patch \ 44 file://0010-Always-use-devmapper.patch \
45 file://0011-fix-bug-of-do_compile-and-do_install.patch \ 45 file://0011-fix-bug-of-do_compile-and-do_install.patch \
46 file://0012-add-explicit-dependency-on-libraries.patch \ 46 file://0012-add-explicit-dependency-on-libraries.patch \
47 file://0001-libmultipath-always-use-glibc-basename.patch \ 47 file://0001-libmpathutils-uxsock.c-Include-string.h-for-memcpy.patch \
48 file://0013-libdmmp-Makefile-Fix-KBUILD_BUILD_TIMESTAMP-usage.patch \
49 file://0014-libdmmp-Makefile-Add-target-docs-man-dmmp_strerror.3.patch \
48 " 50 "
49 51
50LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" 52LIC_FILES_CHKSUM = "file://COPYING;md5=9ec28527f3d544b51ceb0e1907d0bf3f"
51 53
52SRCREV = "3daacfdfd110b24a3a7d5a276dcf8512b7039199" 54SRCREV = "cb8de98b2cc3b62fd1a578ba479c0820778e9c02"
53 55
54S = "${WORKDIR}/git"
55 56
56inherit systemd pkgconfig 57inherit systemd pkgconfig
57 58
@@ -73,6 +74,7 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
73EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \ 74EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
74 OPTFLAGS="${CFLAGS}" \ 75 OPTFLAGS="${CFLAGS}" \
75 prefix=${prefix} \ 76 prefix=${prefix} \
77 etc_prefix=${sysconfdir} \
76 bindir=${base_sbindir} \ 78 bindir=${base_sbindir} \
77 LIB=${base_libdir} libdir=${base_libdir}/multipath \ 79 LIB=${base_libdir} libdir=${base_libdir}/multipath \
78 usrlibdir=${libdir} \ 80 usrlibdir=${libdir} \
@@ -82,6 +84,7 @@ EXTRA_OEMAKE = 'MULTIPATH_VERSION=${PV} DESTDIR=${D} syslibdir=${base_libdir} \
82 modulesloaddir=${sysconfdir}/modules-load.d \ 84 modulesloaddir=${sysconfdir}/modules-load.d \
83 tmpfilesdir=${sysconfdir}/tmpfiles.d \ 85 tmpfilesdir=${sysconfdir}/tmpfiles.d \
84 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \ 86 ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "SYSTEMD=216", "", d)} \
87 KBUILD_BUILD_TIMESTAMP="$(date -u -d "@$SOURCE_DATE_EPOCH" +"%Y-%m-%d %H:%M:%S +0000")" \
85 ' 88 '
86 89
87do_install() { 90do_install() {
diff --git a/meta-oe/recipes-support/nano/nano_8.0.bb b/meta-oe/recipes-support/nano/nano_8.3.bb
index 56aa47f641..d1af89ef8d 100644
--- a/meta-oe/recipes-support/nano/nano_8.0.bb
+++ b/meta-oe/recipes-support/nano/nano_8.3.bb
@@ -7,13 +7,13 @@ SECTION = "console/utils"
7LICENSE = "GPL-3.0-only" 7LICENSE = "GPL-3.0-only"
8LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" 8LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949"
9 9
10DEPENDS = "ncurses file" 10DEPENDS = "ncurses"
11RDEPENDS:${PN} = "ncurses-terminfo-base" 11RDEPENDS:${PN} = "ncurses-terminfo-base"
12 12
13PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" 13PV_MAJOR = "${@d.getVar('PV').split('.')[0]}"
14 14
15SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" 15SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz"
16SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" 16SRC_URI[sha256sum] = "551b717b2e28f7e90f749323686a1b5bbbd84cfa1390604d854a3ca3778f111e"
17 17
18UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" 18UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano"
19 19
diff --git a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
index b10c23984d..b4db0c0f64 100644
--- a/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
+++ b/meta-oe/recipes-support/ne10/ne10_1.2.1.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/projectNe10/Ne10.git;branch=master;protocol=https \
10 " 10 "
11SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f" 11SRCREV = "18c4c982a595dad069cd8df4932aefb1d257591f"
12 12
13S = "${WORKDIR}/git"
14PV .= "+git" 13PV .= "+git"
15 14
16inherit cmake 15inherit cmake
@@ -26,6 +25,7 @@ NE10_TARGET_ARCH:armv7a = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","
26NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}" 25NE10_TARGET_ARCH:armv7ve = "${@bb.utils.contains("TUNE_FEATURES","neon","armv7","",d)}"
27 26
28EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"' 27EXTRA_OECMAKE = '-DGNULINUX_PLATFORM=ON -DNE10_BUILD_SHARED=ON -DNE10_LINUX_TARGET_ARCH="${NE10_TARGET_ARCH}"'
28CFLAGS += "-Wa,--noexecstack"
29 29
30do_install() { 30do_install() {
31 install -d ${D}${libdir} 31 install -d ${D}${libdir}
diff --git a/meta-oe/recipes-support/neon/neon_0.33.0.bb b/meta-oe/recipes-support/neon/neon_0.33.0.bb
index a0333f4560..0ab6d25f53 100644
--- a/meta-oe/recipes-support/neon/neon_0.33.0.bb
+++ b/meta-oe/recipes-support/neon/neon_0.33.0.bb
@@ -5,7 +5,7 @@ LICENSE = "LGPL-2.0-or-later"
5LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \ 5LIC_FILES_CHKSUM = "file://src/COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a \
6 file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133" 6 file://src/ne_utils.h;beginline=1;endline=20;md5=34c8e338bfa0237561e68d30c3c71133"
7 7
8SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \ 8SRC_URI = "https://notroj.github.io/neon/neon-${PV}.tar.gz \
9 file://pkgconfig.patch \ 9 file://pkgconfig.patch \
10 file://0001-Disable-installing-documentation.patch \ 10 file://0001-Disable-installing-documentation.patch \
11 file://run-ptest \ 11 file://run-ptest \
@@ -13,34 +13,31 @@ SRC_URI = "${DEBIAN_MIRROR}/main/n/neon27/neon27_${PV}.orig.tar.gz \
13 13
14SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8" 14SRC_URI[sha256sum] = "659a5cc9cea05e6e7864094f1e13a77abbbdbab452f04d751a8c16a9447cf4b8"
15 15
16inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest 16inherit autotools-brokensep binconfig-disabled lib_package pkgconfig ptest gettext
17
18EXTRA_AUTORECONF += "-I macros"
17 19
18# Enable gnutls or openssl, not both 20# Enable gnutls or openssl, not both
19PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib nls" 21PACKAGECONFIG ?= "expat gnutls libproxy webdav zlib"
20PACKAGECONFIG:class-native = "expat gnutls webdav zlib nls" 22PACKAGECONFIG:class-native = "expat gnutls webdav zlib"
21PACKAGECONFIG:remove:libc-musl = "nls"
22 23
23PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat" 24PACKAGECONFIG[expat] = "--with-expat,--without-expat,expat"
24PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls" 25PACKAGECONFIG[gnutls] = "--with-ssl=gnutls,,gnutls"
25PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5" 26PACKAGECONFIG[gssapi] = "--with-gssapi,--without-gssapi,krb5"
26PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy" 27PACKAGECONFIG[libproxy] = "--with-libproxy,--without-libproxy,libproxy"
27PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2" 28PACKAGECONFIG[libxml2] = "--with-libxml2,--without-libxml2,libxml2"
28PACKAGECONFIG[nls] = ",--disable-nls,gettext-native"
29PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl" 29PACKAGECONFIG[openssl] = "--with-ssl=openssl,,openssl"
30PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav," 30PACKAGECONFIG[webdav] = "--enable-webdav,--disable-webdav,"
31PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" 31PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib"
32 32
33EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix" 33EXTRA_OECONF += "--enable-shared --enable-threadsafe-ssl=posix"
34 34
35# Do not install into /usr/local
36EXTRA_OEMAKE:append:class-native = " prefix=${prefix_native}"
37
38do_configure:prepend() { 35do_configure:prepend() {
39 echo "${PV}" > ${S}/.version 36 echo "${PV}" > ${S}/.version
40} 37}
41 38
42do_compile:append() { 39do_compile:append() {
43 if ${@bb.utils.contains('PACKAGECONFIG', 'nls', 'true', 'false', d)}; then 40 if ${@bb.utils.contains('USE_NLS', 'yes', 'true', 'false', d)}; then
44 oe_runmake compile-gmo 41 oe_runmake compile-gmo
45 fi 42 fi
46 oe_runmake -C test 43 oe_runmake -C test
diff --git a/meta-oe/recipes-support/nmon/nmon_16m.bb b/meta-oe/recipes-support/nmon/nmon_16m.bb
index 1779dd2273..4e7abb2123 100644
--- a/meta-oe/recipes-support/nmon/nmon_16m.bb
+++ b/meta-oe/recipes-support/nmon/nmon_16m.bb
@@ -14,12 +14,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \
14SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" 14SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1"
15SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" 15SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278"
16 16
17UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/nmon/files/"
18UPSTREAM_CHECK_REGEX = "lmon(?P<pver>.*).c"
19
17CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" 20CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM"
18LDFLAGS += "-ltinfo -lncursesw -lm" 21LDFLAGS += "-ltinfo -lncursesw -lm"
19ASNEEDED:pn-nmon = "" 22ASNEEDED:pn-nmon = ""
20 23
21S = "${WORKDIR}/sources" 24S = "${UNPACKDIR}"
22UNPACKDIR = "${S}"
23 25
24do_compile() { 26do_compile() {
25 ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon 27 ${CC} ${CFLAGS} ${LDFLAGS} lmon${PV}.c -o nmon
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
deleted file mode 100644
index 8515075fe0..0000000000
--- a/meta-oe/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 18 Jan 2023 13:04:56 -0800
4Subject: [PATCH] Fix -Wincompatible-function-pointer-types
5
6Fixes warnings with clang16
7testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types]
8
9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 pr/tests/testfile.c | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c
16index 79d8a05..42aa6a7 100644
17--- a/pr/tests/testfile.c
18+++ b/pr/tests/testfile.c
19@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type,
20 if (native_thread) {
21 #if defined(_PR_PTHREADS)
22 pthread_t tid;
23- if (!pthread_create(&tid, NULL, start, arg)) {
24+ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) {
25 return((PRThread *) tid);
26 }
27 else {
28@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void)
29
30 thrarg.done= 0;
31 t = create_new_thread(PR_USER_THREAD,
32- DirTest, &thrarg,
33+ (void (*)(void *))DirTest, &thrarg,
34 PR_PRIORITY_NORMAL,
35 PR_LOCAL_THREAD,
36 PR_UNJOINABLE_THREAD,
37--
382.39.1
39
diff --git a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch b/meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
index 7ba59ed644..5cb14b5781 100644
--- a/meta-oe/recipes-support/nspr/nspr/remove-rpath-from-tests.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0001-remove-rpath-from-tests.patch
@@ -1,5 +1,7 @@
1Author: Andrei Gherzan <andrei@gherzan.ro> 1From 63eb483f7feb05917402731d8f21b396630ef202 Mon Sep 17 00:00:00 2001
2Date: Thu Feb 9 00:03:38 2012 +0200 2From: Andrei Gherzan <andrei@gherzan.ro>
3Date: Thu, 9 Feb 2012 00:03:38 +0200
4Subject: [PATCH] remove rpath from tests
3 5
4Avoid QA warnings by removing hardcoded rpath from binaries. 6Avoid QA warnings by removing hardcoded rpath from binaries.
5 7
@@ -8,14 +10,18 @@ WARNING: QA Issue: package nspr contains bad RPATH {builddir}/tmp/work/armv5te-p
8in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait 10in file {builddir}/tmp/work/armv5te-poky-linux-gnueabi/nspr-4.8.9-r1/packages-split/nspr/usr/lib/nspr/tests/multiwait
9[...] 11[...]
10 12
11Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
12Upstream-Status: Pending 13Upstream-Status: Pending
13 14
14Index: nspr/pr/tests/Makefile.in 15Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
15=================================================================== 16---
16--- nspr.orig/pr/tests/Makefile.in 17 pr/tests/Makefile.in | 2 +-
17+++ nspr/pr/tests/Makefile.in 18 1 file changed, 1 insertion(+), 1 deletion(-)
18@@ -316,7 +316,7 @@ ifeq ($(OS_ARCH), SunOS) 19
20diff --git a/pr/tests/Makefile.in b/pr/tests/Makefile.in
21index 20e2f99..56c73e1 100644
22--- a/pr/tests/Makefile.in
23+++ b/pr/tests/Makefile.in
24@@ -260,7 +260,7 @@ ifeq ($(OS_ARCH), SunOS)
19 endif # SunOS 25 endif # SunOS
20 26
21 ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH))) 27 ifeq (,$(filter-out Linux GNU GNU_%,$(OS_ARCH)))
@@ -24,3 +30,6 @@ Index: nspr/pr/tests/Makefile.in
24 ifeq ($(USE_PTHREADS),1) 30 ifeq ($(USE_PTHREADS),1)
25 EXTRA_LIBS = -lpthread 31 EXTRA_LIBS = -lpthread
26 endif 32 endif
33--
342.25.1
35
diff --git a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch b/meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
index f12acc8548..9e1928e376 100644
--- a/meta-oe/recipes-support/nspr/nspr/fix-build-on-x86_64.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0002-Fix-build-failure-on-x86_64.patch
@@ -1,21 +1,24 @@
1Fix build failure on x86_64 1From f68f2535e98231ab362b6bbbe7cc4718b2c72aa9 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Tue, 31 Dec 2024 10:25:15 +0800
4Subject: [PATCH] Fix build failure on x86_64
2 5
3When the target_cpu is x86_64, we should assume that the pkg uses 64bit, 6When the target_cpu is x86_64, we should assume that the pkg uses 64bit,
4only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a 7only if USE_N32 is set, we can assume that the pkg uses 32bit. It used a
5opposite logic before. 8opposite logic before.
6 9
7Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
8
9Upstream-Status: Pending 10Upstream-Status: Pending
11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
10--- 13---
11 configure.in | 12 ++++++------ 14 configure.in | 16 ++++++----------
12 1 files changed, 6 insertions(+), 6 deletions(-) 15 1 file changed, 6 insertions(+), 10 deletions(-)
13 16
14Index: nspr/configure.in 17diff --git a/configure.in b/configure.in
15=================================================================== 18index 1a3e489..04419d9 100644
16--- nspr.orig/configure.in 19--- a/configure.in
17+++ nspr/configure.in 20+++ b/configure.in
18@@ -1875,28 +1875,24 @@ tools are selected during the Xcode/Deve 21@@ -1590,28 +1590,24 @@ tools are selected during the Xcode/Developer Tools installation.])
19 PR_MD_ASFILES=os_Linux_ia64.s 22 PR_MD_ASFILES=os_Linux_ia64.s
20 ;; 23 ;;
21 x86_64) 24 x86_64)
@@ -49,4 +52,7 @@ Index: nspr/configure.in
49- PR_MD_ASFILES=os_Linux_ppc.s 52- PR_MD_ASFILES=os_Linux_ppc.s
50 fi 53 fi
51 ;; 54 ;;
52 esac 55 esac
56--
572.25.1
58
diff --git a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
index dab2a4e291..3d1bbd31a7 100644
--- a/meta-oe/recipes-support/nspr/nspr/0002-Add-nios2-support.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0003-Add-nios2-support.patch
@@ -1,21 +1,23 @@
1From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001 1From 09a67d3945f1fde8372532ef2e19af20db2112cd Mon Sep 17 00:00:00 2001
2From: Marek Vasut <marex@denx.de> 2From: Marek Vasut <marex@denx.de>
3Date: Sat, 30 Jan 2016 07:18:02 +0100 3Date: Sat, 30 Jan 2016 07:18:02 +0100
4Subject: [PATCH] Add nios2 support 4Subject: [PATCH] Add nios2 support
5 5
6Add support for the nios2 CPU. 6Add support for the nios2 CPU.
7 7
8Signed-off-by: Marek Vasut <marex@denx.de>
9Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] 8Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ]
10 9
10Signed-off-by: Marek Vasut <marex@denx.de>
11--- 11---
12 pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++ 12 pr/include/md/_linux.cfg | 45 ++++++++++++++++++++++++++++++++++++++++
13 pr/include/md/_linux.h | 4 +++- 13 pr/include/md/_linux.h | 4 +++-
14 2 files changed, 48 insertions(+), 1 deletion(-) 14 2 files changed, 48 insertions(+), 1 deletion(-)
15 15
16diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
17index 009d5e5..77c13df 100644
16--- a/pr/include/md/_linux.cfg 18--- a/pr/include/md/_linux.cfg
17+++ b/pr/include/md/_linux.cfg 19+++ b/pr/include/md/_linux.cfg
18@@ -975,6 +975,51 @@ 20@@ -979,6 +979,51 @@
19 #define PR_BYTES_PER_WORD_LOG2 2 21 #define PR_BYTES_PER_WORD_LOG2 2
20 #define PR_BYTES_PER_DWORD_LOG2 3 22 #define PR_BYTES_PER_DWORD_LOG2 3
21 23
@@ -67,6 +69,8 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
67 #elif defined(__or1k__) 69 #elif defined(__or1k__)
68 70
69 #undef IS_LITTLE_ENDIAN 71 #undef IS_LITTLE_ENDIAN
72diff --git a/pr/include/md/_linux.h b/pr/include/md/_linux.h
73index ad57d08..45a2231 100644
70--- a/pr/include/md/_linux.h 74--- a/pr/include/md/_linux.h
71+++ b/pr/include/md/_linux.h 75+++ b/pr/include/md/_linux.h
72@@ -55,6 +55,8 @@ 76@@ -55,6 +55,8 @@
@@ -78,7 +82,7 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
78 #elif defined(__or1k__) 82 #elif defined(__or1k__)
79 #define _PR_SI_ARCHITECTURE "or1k" 83 #define _PR_SI_ARCHITECTURE "or1k"
80 #elif defined(__riscv) && (__riscv_xlen == 32) 84 #elif defined(__riscv) && (__riscv_xlen == 32)
81@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn 85@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRInt32 *val, PRInt32 newval);
82 #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet 86 #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet
83 #endif 87 #endif
84 88
@@ -87,3 +91,6 @@ Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=124442
87 #if defined(__GNUC__) 91 #if defined(__GNUC__)
88 /* Use GCC built-in functions */ 92 /* Use GCC built-in functions */
89 #define _PR_HAVE_ATOMIC_OPS 93 #define _PR_HAVE_ATOMIC_OPS
94--
952.25.1
96
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
index 09855a03dc..75d184bb3b 100644
--- a/meta-oe/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0004-md-Fix-build-with-musl.patch
@@ -1,4 +1,4 @@
1From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001 1From e8cab35851949cd4b7498d56978c5e7907841f32 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 18 Sep 2017 17:22:43 -0700 3Date: Mon, 18 Sep 2017 17:22:43 -0700
4Subject: [PATCH] md: Fix build with musl 4Subject: [PATCH] md: Fix build with musl
@@ -7,17 +7,17 @@ The MIPS specific header <sgidefs.h> is not provided by musl
7linux kernel headers provide <asm/sgidefs.h> which has same definitions 7linux kernel headers provide <asm/sgidefs.h> which has same definitions
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- 12---
13 pr/include/md/_linux.cfg | 2 +- 13 pr/include/md/_linux.cfg | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg 16diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg
17index aa3af78..899826f 100644 17index 77c13df..3eb2faf 100644
18--- a/pr/include/md/_linux.cfg 18--- a/pr/include/md/_linux.cfg
19+++ b/pr/include/md/_linux.cfg 19+++ b/pr/include/md/_linux.cfg
20@@ -511,7 +511,7 @@ 20@@ -515,7 +515,7 @@
21 #error "Unknown MIPS endianness." 21 #error "Unknown MIPS endianness."
22 #endif 22 #endif
23 23
@@ -26,3 +26,6 @@ index aa3af78..899826f 100644
26 26
27 #define IS_64 27 #define IS_64
28 28
29--
302.25.1
31
diff --git a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch b/meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
index 90fe45f34d..470ada591a 100644
--- a/meta-oe/recipes-support/nspr/nspr/Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch
@@ -1,4 +1,4 @@
1From 8a592e4ead4ed6befe6044da3dd2dc7523c33905 Mon Sep 17 00:00:00 2001 1From 161c955f32dd350413de076b7cad588fa4bdc4de Mon Sep 17 00:00:00 2001
2From: Mingli Yu <Mingli.Yu@windriver.com> 2From: Mingli Yu <Mingli.Yu@windriver.com>
3Date: Fri, 16 Nov 2018 13:52:49 +0800 3Date: Fri, 16 Nov 2018 13:52:49 +0800
4Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME 4Subject: [PATCH] Makefile.in: remove _BUILD_STRING and _BUILD_TIME
@@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
23 4 files changed, 4 insertions(+), 28 deletions(-) 23 4 files changed, 4 insertions(+), 28 deletions(-)
24 24
25diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in 25diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in
26index e737791..b578476 100644 26index fa8c783..74b4bdd 100644
27--- a/lib/ds/Makefile.in 27--- a/lib/ds/Makefile.in
28+++ b/lib/ds/Makefile.in 28+++ b/lib/ds/Makefile.in
29@@ -114,13 +114,7 @@ GARBAGE += $(TINC) 29@@ -104,13 +104,7 @@ GARBAGE += $(TINC)
30 30
31 $(TINC): 31 $(TINC):
32 @$(MAKE_OBJDIR) 32 @$(MAKE_OBJDIR)
@@ -42,10 +42,10 @@ index e737791..b578476 100644
42 42
43 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) 43 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
44diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in 44diff --git a/lib/libc/src/Makefile.in b/lib/libc/src/Makefile.in
45index e8a6d9f..978ed28 100644 45index 9ef2007..21abd6f 100644
46--- a/lib/libc/src/Makefile.in 46--- a/lib/libc/src/Makefile.in
47+++ b/lib/libc/src/Makefile.in 47+++ b/lib/libc/src/Makefile.in
48@@ -116,13 +116,7 @@ GARBAGE += $(TINC) 48@@ -106,13 +106,7 @@ GARBAGE += $(TINC)
49 49
50 $(TINC): 50 $(TINC):
51 @$(MAKE_OBJDIR) 51 @$(MAKE_OBJDIR)
@@ -61,10 +61,10 @@ index e8a6d9f..978ed28 100644
61 61
62 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) 62 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
63diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in 63diff --git a/lib/prstreams/Makefile.in b/lib/prstreams/Makefile.in
64index aeb2944..f318097 100644 64index 5865ab8..a00d20c 100644
65--- a/lib/prstreams/Makefile.in 65--- a/lib/prstreams/Makefile.in
66+++ b/lib/prstreams/Makefile.in 66+++ b/lib/prstreams/Makefile.in
67@@ -116,13 +116,7 @@ endif 67@@ -102,13 +102,7 @@ endif
68 68
69 $(TINC): 69 $(TINC):
70 @$(MAKE_OBJDIR) 70 @$(MAKE_OBJDIR)
@@ -80,10 +80,10 @@ index aeb2944..f318097 100644
80 80
81 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) 81 $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC)
82diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in 82diff --git a/pr/src/Makefile.in b/pr/src/Makefile.in
83index 19c5a69..b4ac31c 100644 83index a9e86f5..bbcbb67 100644
84--- a/pr/src/Makefile.in 84--- a/pr/src/Makefile.in
85+++ b/pr/src/Makefile.in 85+++ b/pr/src/Makefile.in
86@@ -326,13 +326,7 @@ GARBAGE += $(TINC) 86@@ -291,13 +291,7 @@ GARBAGE += $(TINC)
87 87
88 $(TINC): 88 $(TINC):
89 @$(MAKE_OBJDIR) 89 @$(MAKE_OBJDIR)
@@ -99,5 +99,5 @@ index 19c5a69..b4ac31c 100644
99 99
100 $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC) 100 $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): prvrsion.c $(TINC)
101-- 101--
1022.7.4 1022.25.1
103 103
diff --git a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
index 6ebc9c4ae6..fa7dbcc474 100644
--- a/meta-oe/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch
+++ b/meta-oe/recipes-support/nspr/nspr/0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch
@@ -1,4 +1,4 @@
1From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001 1From 88bf2abc07ae56ed1bcc9e915add0b3d9ed66c7b Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com> 2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Wed, 10 Aug 2022 15:21:07 +0800 3Date: Wed, 10 Aug 2022 15:21:07 +0800
4Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS 4Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS
diff --git a/meta-oe/recipes-support/nspr/nspr_4.35.bb b/meta-oe/recipes-support/nspr/nspr_4.36.bb
index abd750b138..c129362539 100644
--- a/meta-oe/recipes-support/nspr/nspr_4.35.bb
+++ b/meta-oe/recipes-support/nspr/nspr_4.36.bb
@@ -6,13 +6,12 @@ LIC_FILES_CHKSUM = "file://configure.in;beginline=3;endline=6;md5=90c2fdee38e45d
6SECTION = "libs/network" 6SECTION = "libs/network"
7 7
8SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ 8SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \
9 file://remove-rpath-from-tests.patch \ 9 file://0001-remove-rpath-from-tests.patch \
10 file://fix-build-on-x86_64.patch \ 10 file://0002-Fix-build-failure-on-x86_64.patch \
11 file://0002-Add-nios2-support.patch \ 11 file://0003-Add-nios2-support.patch \
12 file://0001-md-Fix-build-with-musl.patch \ 12 file://0004-md-Fix-build-with-musl.patch \
13 file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ 13 file://0005-Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \
14 file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ 14 file://0006-config-nspr-config.in-don-t-pass-LDFLAGS.patch \
15 file://0001-Fix-Wincompatible-function-pointer-types.patch \
16 file://nspr.pc.in \ 15 file://nspr.pc.in \
17 " 16 "
18 17
@@ -24,11 +23,11 @@ CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE
24UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" 23UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/"
25UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/" 24UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)/"
26 25
27SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f" 26SRC_URI[sha256sum] = "55dec317f1401cd2e5dba844d340b930ab7547f818179a4002bce62e6f1c6895"
28 27
29CVE_PRODUCT = "netscape_portable_runtime" 28CVE_PRODUCT = "netscape_portable_runtime"
30 29
31S = "${WORKDIR}/nspr-${PV}/nspr" 30S = "${UNPACKDIR}/nspr-${PV}/nspr"
32 31
33RDEPENDS:${PN}-dev += "perl" 32RDEPENDS:${PN}-dev += "perl"
34TARGET_CC_ARCH += "${LDFLAGS}" 33TARGET_CC_ARCH += "${LDFLAGS}"
diff --git a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
index 2385fd3b9d..5733bb068f 100644
--- a/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0001-nss-fix-support-cross-compiling.patch
@@ -1,21 +1,21 @@
1From 46ab1ca6e6fb8e1196e0665a54506dff370f8f2a Mon Sep 17 00:00:00 2001 1From c15470d6b52986a8e41f9be4579c88ed80413b44 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 22 Feb 2017 11:36:11 +0200 3Date: Wed, 22 Feb 2017 11:36:11 +0200
4Subject: [PATCH] nss: fix support cross compiling 4Subject: [PATCH] nss: fix support cross compiling
5 5
6Let some make variables be assigned from outside makefile. 6Let some make variables be assigned from outside makefile.
7 7
8Upstream-Status: Inappropriate [configuration] 8Upstream-Status: Inappropriate [oe specific]
9
9Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11
12--- 12---
13 nss/coreconf/arch.mk | 4 ++-- 13 nss/coreconf/arch.mk | 4 ++--
14 nss/lib/freebl/Makefile | 6 ++++++ 14 nss/lib/freebl/Makefile | 6 ++++++
15 2 files changed, 8 insertions(+), 2 deletions(-) 15 2 files changed, 8 insertions(+), 2 deletions(-)
16 16
17diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk 17diff --git a/nss/coreconf/arch.mk b/nss/coreconf/arch.mk
18index 17e9fae..bc4180a 100644 18index 711d19d..a163d24 100644
19--- a/nss/coreconf/arch.mk 19--- a/nss/coreconf/arch.mk
20+++ b/nss/coreconf/arch.mk 20+++ b/nss/coreconf/arch.mk
21@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s)) 21@@ -26,11 +26,11 @@ OS_ARCH := $(subst /,_,$(shell uname -s))
@@ -33,7 +33,7 @@ index 17e9fae..bc4180a 100644
33 33
34 34
35diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile 35diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
36index eeee90a..7ee8736 100644 36index e744314..0ebfc92 100644
37--- a/nss/lib/freebl/Makefile 37--- a/nss/lib/freebl/Makefile
38+++ b/nss/lib/freebl/Makefile 38+++ b/nss/lib/freebl/Makefile
39@@ -36,6 +36,12 @@ ifdef USE_64 39@@ -36,6 +36,12 @@ ifdef USE_64
@@ -49,3 +49,6 @@ index eeee90a..7ee8736 100644
49 ifdef USE_ABI32_FPU 49 ifdef USE_ABI32_FPU
50 DEFINES += -DNSS_USE_ABI32_FPU 50 DEFINES += -DNSS_USE_ABI32_FPU
51 endif 51 endif
52--
532.25.1
54
diff --git a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
index 8c715cc447..19fa5a7261 100644
--- a/meta-oe/recipes-support/nss/nss/nss-no-rpath-for-cross-compiling.patch
+++ b/meta-oe/recipes-support/nss/nss/0002-nss-no-rpath-for-cross-compiling.patch
@@ -1,11 +1,11 @@
1From 73edfbdf33fe4e41724e7e947033d8caeec8f3d0 Mon Sep 17 00:00:00 2001 1From 621023bc696d3d26a4179dbbafb42d79bef1faf9 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com> 2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Sat, 7 Mar 2020 08:34:02 -0800 3Date: Sat, 7 Mar 2020 08:34:02 -0800
4Subject: [PATCH] nss:no rpath for cross compiling 4Subject: [PATCH] nss:no rpath for cross compiling
5 5
6Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 6Upstream-Status: Inappropriate [oe specific]
7Upstream-Status: Inappropriate [configuration]
8 7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9--- 9---
10 nss/cmd/platlibs.mk | 4 ++-- 10 nss/cmd/platlibs.mk | 4 ++--
11 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
@@ -26,3 +26,6 @@ index 6401778..e5c4e16 100644
26 endif 26 endif
27 endif 27 endif
28 28
29--
302.25.1
31
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
index 735b06b5ca..61b7565739 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-incorrect-shebang-of-perl.patch
+++ b/meta-oe/recipes-support/nss/nss/0003-nss-fix-incorrect-shebang-of-perl.patch
@@ -1,14 +1,14 @@
1From 2ce67b1f4b1f582d556ae058da10698bbaa0edc1 Mon Sep 17 00:00:00 2001 1From 6aec640342088498cb1b0a2e395eb3da297a48b4 Mon Sep 17 00:00:00 2001
2From: Ovidiu Panait <ovidiu.panait@windriver.com> 2From: Ovidiu Panait <ovidiu.panait@windriver.com>
3Date: Mon, 13 Jul 2020 12:12:31 +0300 3Date: Mon, 13 Jul 2020 12:12:31 +0300
4Subject: [PATCH] nss: fix incorrect shebang of perl 4Subject: [PATCH] nss: fix incorrect shebang of perl
5 5
6Replace incorrect shebang of perl with `#!/usr/bin/env perl'. 6Replace incorrect shebang of perl with `#!/usr/bin/env perl'.
7 7
8Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
9Upstream-Status: Pending 8Upstream-Status: Pending
10Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
11 9
10Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
11Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
12--- 12---
13 nss/cmd/signver/examples/1/form.pl | 2 +- 13 nss/cmd/signver/examples/1/form.pl | 2 +-
14 nss/cmd/signver/examples/1/signedForm.pl | 2 +- 14 nss/cmd/signver/examples/1/signedForm.pl | 2 +-
@@ -89,3 +89,6 @@ index f29f60a..850332a 100755
89 89
90 ######################################################################## 90 ########################################################################
91 # 91 #
92--
932.25.1
94
diff --git a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
index 4c9bea30c0..fa4c5bacbf 100644
--- a/meta-oe/recipes-support/nss/nss/disable-Wvarargs-with-clang.patch
+++ b/meta-oe/recipes-support/nss/nss/0004-nss-disable-Wvarargs-with-clang.patch
@@ -1,7 +1,7 @@
1From f613c9a9107435a40d91329f33f12cfb16927f07 Mon Sep 17 00:00:00 2001 1From 72c3150300975524bb0001b5a731f077852c95ab Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 7 Mar 2020 08:34:02 -0800 3Date: Sat, 7 Mar 2020 08:34:02 -0800
4Subject: [PATCH] nss,nspr: Add recipes 4Subject: [PATCH] nss: disable Wvarargs with clang
5 5
6clang 3.9 add this warning to rightly flag undefined 6clang 3.9 add this warning to rightly flag undefined
7behavior, we relegate this to be just a warning instead 7behavior, we relegate this to be just a warning instead
@@ -20,9 +20,9 @@ see
20https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start 20https://www.securecoding.cert.org/confluence/display/cplusplus/EXP58-CPP.+Pass+an+object+of+the+correct+type+to+va_start
21for more details 21for more details
22 22
23Signed-off-by: Khem Raj <raj.khem@gmail.com>
24Upstream-Status: Pending 23Upstream-Status: Pending
25 24
25Signed-off-by: Khem Raj <raj.khem@gmail.com>
26--- 26---
27 nss/coreconf/Werror.mk | 2 +- 27 nss/coreconf/Werror.mk | 2 +-
28 1 file changed, 1 insertion(+), 1 deletion(-) 28 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -40,3 +40,6 @@ index a569a49..687fe58 100644
40 # -Wno-parentheses-equality : because clang warns about macro expansions 40 # -Wno-parentheses-equality : because clang warns about macro expansions
41 WARNING_CFLAGS += $(call disable_warning,parentheses-equality) 41 WARNING_CFLAGS += $(call disable_warning,parentheses-equality)
42 ifdef BUILD_OPT 42 ifdef BUILD_OPT
43--
442.25.1
45
diff --git a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
index 589b4d5e7f..f12a278ef2 100644
--- a/meta-oe/recipes-support/nss/nss/pqg.c-ULL_addend.patch
+++ b/meta-oe/recipes-support/nss/nss/0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch
@@ -1,22 +1,22 @@
1From cbd367160338847b28fc801a12c74f1c8b5b03ee Mon Sep 17 00:00:00 2001 1From 5935755eef43ac7cb8f4567e7bed5892180f954c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 7 Mar 2020 08:34:02 -0800 3Date: Sat, 7 Mar 2020 08:34:02 -0800
4Subject: [PATCH] nss does not build on mips with clang because wrong types are 4Subject: [PATCH] nss: does not build on mips with clang because wrong types
5 used? 5 are used
6 6
7pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare] 7pqg.c:339:16: error: comparison of constant 18446744073709551615 with expression of type 'unsigned long' is always true [-Werror,-Wtautological-constant-out-of-range-compare]
8 if (addend < MP_DIGIT_MAX) { 8 if (addend < MP_DIGIT_MAX) {
9 ~~~~~~ ^ ~~~~~~~~~~~~ 9 ~~~~~~ ^ ~~~~~~~~~~~~
10 10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12Upstream-Status: Pending 11Upstream-Status: Pending
13 12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14---
15 nss/lib/freebl/pqg.c | 4 ++-- 15 nss/lib/freebl/pqg.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-) 16 1 file changed, 2 insertions(+), 2 deletions(-)
17 17
18diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c 18diff --git a/nss/lib/freebl/pqg.c b/nss/lib/freebl/pqg.c
19index 1b03278..ad895b7 100644 19index 62d46b5..8c8665d 100644
20--- a/nss/lib/freebl/pqg.c 20--- a/nss/lib/freebl/pqg.c
21+++ b/nss/lib/freebl/pqg.c 21+++ b/nss/lib/freebl/pqg.c
22@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H) 22@@ -326,8 +326,8 @@ generate_h_candidate(SECItem *hit, mp_int *H)
@@ -30,3 +30,6 @@ index 1b03278..ad895b7 100644
30 SECItem *seedout) 30 SECItem *seedout)
31 { 31 {
32 mp_int s, sum, modulus, tmp; 32 mp_int s, sum, modulus, tmp;
33--
342.25.1
35
diff --git a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
index a1897f88d8..afe11821af 100644
--- a/meta-oe/recipes-support/nss/nss/nss-fix-nsinstall-build.patch
+++ b/meta-oe/recipes-support/nss/nss/0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch
@@ -1,4 +1,4 @@
1From f9b2b1c738576a17460aebd005f511f427aa1974 Mon Sep 17 00:00:00 2001 1From 895e76e75dbb993a8f445072c190a9db4ee50d15 Mon Sep 17 00:00:00 2001
2From: Wenzong Fan <wenzong.fan@windriver.com> 2From: Wenzong Fan <wenzong.fan@windriver.com>
3Date: Sat, 7 Mar 2020 08:34:02 -0800 3Date: Sat, 7 Mar 2020 08:34:02 -0800
4Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit 4Subject: [PATCH] Fix nss multilib build on openSUSE 11.x 32bit
@@ -15,17 +15,15 @@ on host to install built files, it doesn't need any cross-compling or
15multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this 15multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this
16error. 16error.
17 17
18Upstream-Status: Inappropriate [configuration] 18Upstream-Status: Inappropriate [oe specific]
19 19
20Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> 20Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
21===================================================
22
23--- 21---
24 nss/coreconf/nsinstall/Makefile | 7 +++++++ 22 nss/coreconf/nsinstall/Makefile | 7 +++++++
25 1 file changed, 7 insertions(+) 23 1 file changed, 7 insertions(+)
26 24
27diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile 25diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile
28index 08dfbc2..e97fb5f 100644 26index 337cbeb..dd77fbe 100644
29--- a/nss/coreconf/nsinstall/Makefile 27--- a/nss/coreconf/nsinstall/Makefile
30+++ b/nss/coreconf/nsinstall/Makefile 28+++ b/nss/coreconf/nsinstall/Makefile
31@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1 29@@ -18,6 +18,13 @@ INTERNAL_TOOLS = 1
@@ -39,6 +37,9 @@ index 08dfbc2..e97fb5f 100644
39+LDFLAGS = 37+LDFLAGS =
40+# CFLAGS = 38+# CFLAGS =
41+ 39+
42 ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) 40 ifeq (,$(filter-out WIN%,$(OS_TARGET)))
43 PROGRAM = 41 PROGRAM =
44 TARGETS = 42 TARGETS =
43--
442.25.1
45
diff --git a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
index b7f1b01a14..63f822be25 100644
--- a/meta-oe/recipes-support/nss/nss/0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
+++ b/meta-oe/recipes-support/nss/nss/0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch
@@ -1,4 +1,4 @@
1From 7c8f367faf8848a43a414079189e10270d6c0fcc Mon Sep 17 00:00:00 2001 1From 459ee39104228a958a0999e1a7d4c43e4e6fe4f0 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 18 Dec 2019 12:29:50 +0100 3Date: Wed, 18 Dec 2019 12:29:50 +0100
4Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto 4Subject: [PATCH] freebl: add a configure option to disable ARM HW crypto
@@ -7,15 +7,15 @@ Not all current hardware supports it, particularly anything
7prior to armv8 does not. 7prior to armv8 does not.
8 8
9Upstream-Status: Pending 9Upstream-Status: Pending
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11 10
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12--- 12---
13 nss/lib/freebl/Makefile | 3 +++ 13 nss/lib/freebl/Makefile | 3 +++
14 nss/lib/freebl/gcm.c | 2 ++ 14 nss/lib/freebl/gcm.c | 2 ++
15 2 files changed, 5 insertions(+) 15 2 files changed, 5 insertions(+)
16 16
17diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile 17diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
18index 7ee8736..f9b4925 100644 18index 0ebfc92..3ee7623 100644
19--- a/nss/lib/freebl/Makefile 19--- a/nss/lib/freebl/Makefile
20+++ b/nss/lib/freebl/Makefile 20+++ b/nss/lib/freebl/Makefile
21@@ -142,6 +142,8 @@ endif 21@@ -142,6 +142,8 @@ endif
@@ -33,10 +33,10 @@ index 7ee8736..f9b4925 100644
33 endif 33 endif
34+endif 34+endif
35 35
36 ifeq (OS2,$(OS_TARGET)) 36 ifeq (,$(filter-out WINNT,$(OS_TARGET)))
37 ASFILES = mpi_x86_os2.s 37 ifndef USE_64
38diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c 38diff --git a/nss/lib/freebl/gcm.c b/nss/lib/freebl/gcm.c
39index 2dae724..9ee7fc8 100644 39index a2f63a6..743158e 100644
40--- a/nss/lib/freebl/gcm.c 40--- a/nss/lib/freebl/gcm.c
41+++ b/nss/lib/freebl/gcm.c 41+++ b/nss/lib/freebl/gcm.c
42@@ -18,6 +18,7 @@ 42@@ -18,6 +18,7 @@
@@ -53,5 +53,5 @@ index 2dae724..9ee7fc8 100644
53 #endif 53 #endif
54+#endif 54+#endif
55 55
56 /* Forward declarations */ 56 #if defined(__ARM_NEON) || defined(__ARM_NEON__)
57 SECStatus gcm_HashInit_hw(gcmHashContext *ghash); 57 #include <arm_neon.h>
diff --git a/meta-oe/recipes-support/nss/nss_3.101.bb b/meta-oe/recipes-support/nss/nss_3.112.bb
index 5a01efb7e4..cf0b20d48b 100644
--- a/meta-oe/recipes-support/nss/nss_3.101.bb
+++ b/meta-oe/recipes-support/nss/nss_3.112.bb
@@ -22,21 +22,21 @@ VERSION_DIR = "${@d.getVar('BP').upper().replace('-', '_').replace('.', '_') + '
22 22
23SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \ 23SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/${BP}.tar.gz \
24 file://nss.pc.in \ 24 file://nss.pc.in \
25 file://0001-nss-fix-support-cross-compiling.patch \
26 file://nss-no-rpath-for-cross-compiling.patch \
27 file://nss-fix-incorrect-shebang-of-perl.patch \
28 file://disable-Wvarargs-with-clang.patch \
29 file://pqg.c-ULL_addend.patch \
30 file://blank-cert9.db \ 25 file://blank-cert9.db \
31 file://blank-key4.db \ 26 file://blank-key4.db \
32 file://system-pkcs11.txt \ 27 file://system-pkcs11.txt \
33 file://nss-fix-nsinstall-build.patch \ 28 file://0001-nss-fix-support-cross-compiling.patch \
34 file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ 29 file://0002-nss-no-rpath-for-cross-compiling.patch \
30 file://0003-nss-fix-incorrect-shebang-of-perl.patch \
31 file://0004-nss-disable-Wvarargs-with-clang.patch \
32 file://0005-nss-does-not-build-on-mips-with-clang-because-wrong-.patch \
33 file://0006-Fix-nss-multilib-build-on-openSUSE-11.x-32bit.patch \
34 file://0007-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \
35 " 35 "
36SRC_URI[sha256sum] = "859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7" 36SRC_URI[sha256sum] = "33ae72d43b275957252adc8639e84229d3ae692a57b6191b059d9456b8568a68"
37 37
38UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" 38UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/"
39UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" 39UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)"
40 40
41inherit siteinfo 41inherit siteinfo
42 42
diff --git a/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-oe/recipes-support/onig/onig_6.9.10.bb
index b29437db1e..f285c2ed73 100644
--- a/meta-oe/recipes-support/onig/onig_6.9.9.bb
+++ b/meta-oe/recipes-support/onig/onig_6.9.10.bb
@@ -14,7 +14,10 @@ SRC_URI = "\
14 file://run-ptest \ 14 file://run-ptest \
15" 15"
16 16
17SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" 17SRC_URI[sha256sum] = "2a5cfc5ae259e4e97f86b68dfffc152cdaffe94e2060b770cb827238d769fc05"
18
19UPSTREAM_CHECK_URI = "https://github.com/kkos/oniguruma/releases/"
20UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
18 21
19BINCONFIG = "${bindir}/onig-config" 22BINCONFIG = "${bindir}/onig-config"
20 23
diff --git a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
index 6cacd3722c..7390d83bcc 100644
--- a/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
+++ b/meta-oe/recipes-support/opencl/clinfo_3.0.23.01.25.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/Oblomov/clinfo.git;protocol=https;branch=master"
11 11
12SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf" 12SRCREV = "748c3930a9b9cb826e631d77439e2cb8f84f5bcf"
13 13
14S = "${WORKDIR}/git"
15 14
16DEPENDS += "opencl-headers virtual/opencl-icd" 15DEPENDS += "opencl-headers virtual/opencl-icd"
17 16
diff --git a/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
new file mode 100644
index 0000000000..73c9d06667
--- /dev/null
+++ b/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch
@@ -0,0 +1,65 @@
1From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001
2From: Wang Mingyu <wangmy@fujitsu.com>
3Date: Thu, 27 Jun 2024 06:27:18 +0000
4Subject: Fix incompatible pointer type error with gcc option
5 -Wincompatible-pointer-types
6
7| ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run':
8| ../../../openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
9| 239 | sock->fd = ifd_get_eventfd(reader, &sock->events);
10| | ^~~~~~~~~~~~~
11| | |
12| | int *
13| In file included from ../../../openct-0.6.20/src/ifd/internal.h:17,
14| from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7:
15| ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *'
16| 182 | extern int ifd_get_eventfd(ifd_reader_t *, short *);
17| | ^~~~~~~
18
19| ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write':
20| ../../../openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
21| 461 | || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
22| | ^~~~~~~~~
23| | |
24| | unsigned int *
25| In file included from ../../../openct-0.6.20/src/ifd/process.c:20:
26| ../../../openct-0.6.20/src/include/openct/tlv.h:40:62: note: expected 'size_t *' {aka 'long unsigned int *'} but argument is of type 'unsigned int *'
27| 40 | ifd_tag_t, unsigned char **, size_t *);
28
29Upstream-Status: Submitted
30
31Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
32---
33 src/ifd/ifdhandler.c | 2 +-
34 src/ifd/process.c | 2 +-
35 2 files changed, 2 insertions(+), 2 deletions(-)
36
37diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c
38index 12686c9..ebd1b53 100644
39--- a/src/ifd/ifdhandler.c
40+++ b/src/ifd/ifdhandler.c
41@@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader)
42 sock->fd = -1;
43 }
44 else {
45- sock->fd = ifd_get_eventfd(reader, &sock->events);
46+ sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events);
47 }
48 if (sock->fd == -1) {
49 ifd_debug(1, "events inactive for reader %s", reader->name);
50diff --git a/src/ifd/process.c b/src/ifd/process.c
51index 4563bdf..7088a76 100644
52--- a/src/ifd/process.c
53+++ b/src/ifd/process.c
54@@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit,
55 return IFD_ERROR_INVALID_SLOT;
56
57 if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0
58- || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len))
59+ || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len))
60 return IFD_ERROR_MISSING_ARG;
61
62 rc = ifd_card_write_memory(reader, unit, address, data, data_len);
63--
642.34.1
65
diff --git a/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-oe/recipes-support/openct/openct_0.6.20.bb
index e4b99089f5..c7b0d0d56d 100644
--- a/meta-oe/recipes-support/openct/openct_0.6.20.bb
+++ b/meta-oe/recipes-support/openct/openct_0.6.20.bb
@@ -18,11 +18,13 @@ SRC_URI = " \
18 file://openct.init \ 18 file://openct.init \
19 file://openct.sysconfig \ 19 file://openct.sysconfig \
20 file://openct.service \ 20 file://openct.service \
21 file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \
21" 22"
22 23
23SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21"
24SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" 24SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68"
25 25
26UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/"
27
26LICENSE = "LGPL-2.0-or-later" 28LICENSE = "LGPL-2.0-or-later"
27LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" 29LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1"
28 30
@@ -30,7 +32,7 @@ inherit systemd
30SYSTEMD_SERVICE:${PN} += "openct.service " 32SYSTEMD_SERVICE:${PN} += "openct.service "
31SYSTEMD_AUTO_ENABLE = "enable" 33SYSTEMD_AUTO_ENABLE = "enable"
32 34
33EXTRA_OECONF=" \ 35EXTRA_OECONF = " \
34 --disable-static \ 36 --disable-static \
35 --enable-usb \ 37 --enable-usb \
36 --enable-pcsc \ 38 --enable-pcsc \
@@ -82,3 +84,8 @@ do_install () {
82} 84}
83 85
84BBCLASSEXTEND = "native" 86BBCLASSEXTEND = "native"
87
88# http://errors.yoctoproject.org/Errors/Details/766890/
89# openct-0.6.20/src/ifd/ifdhandler.c:239:52: error: passing argument 2 of 'ifd_get_eventfd' from incompatible pointer type [-Wincompatible-pointer-types]
90# openct-0.6.20/src/ifd/process.c:461:61: error: passing argument 4 of 'ct_tlv_get_opaque' from incompatible pointer type [-Wincompatible-pointer-types]
91CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/opencv/ade_0.1.2.bb b/meta-oe/recipes-support/opencv/ade_0.1.2.bb
index 93b14ad4f3..b54c28d624 100644
--- a/meta-oe/recipes-support/opencv/ade_0.1.2.bb
+++ b/meta-oe/recipes-support/opencv/ade_0.1.2.bb
@@ -13,7 +13,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57"
13 13
14inherit cmake 14inherit cmake
15 15
16S = "${WORKDIR}/git"
17 16
18EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release" 17EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release"
19 18
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch
new file mode 100644
index 0000000000..b35335c35e
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-FastCV-latest-libs-hash-update.patch
@@ -0,0 +1,50 @@
1From ba6eb8d95292f4631a3b8de09bfaa59e43c17226 Mon Sep 17 00:00:00 2001
2From: adsha-quic <quic_adsha@quicinc.com>
3Date: Wed, 16 Apr 2025 18:54:40 +0530
4Subject: [PATCH] FROMLIST: Merge pull request #27214 from CodeLinaro:fastcv_lib_hash_update
5
6Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
7Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/27214]
8
9---
10 3rdparty/fastcv/fastcv.cmake | 14 +++++++-------
11 1 file changed, 7 insertions(+), 7 deletions(-)
12
13diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake
14index 5c81c11300..6fee4ce4ce 100644
15--- a/3rdparty/fastcv/fastcv.cmake
16+++ b/3rdparty/fastcv/fastcv.cmake
17@@ -1,23 +1,23 @@
18 function(download_fastcv root_dir)
19
20 # Commit SHA in the opencv_3rdparty repo
21- set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0")
22+ set(FASTCV_COMMIT "8d86e68dad8b80b8575a8d3cf401d3ee96c24148")
23
24 # Define actual FastCV versions
25 if(ANDROID)
26 if(AARCH64)
27 message(STATUS "Download FastCV for Android aarch64")
28- set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2024_12_11.tgz")
29- set(FCV_PACKAGE_HASH "9dac41e86597305f846212dae31a4a88")
30+ set(FCV_PACKAGE_NAME "fastcv_android_aarch64_2025_04_08.tgz")
31+ set(FCV_PACKAGE_HASH "e028966a1d1b2f3f0bc5967d316e8b64")
32 else()
33 message(STATUS "Download FastCV for Android armv7")
34- set(FCV_PACKAGE_NAME "fastcv_android_arm32_2024_12_11.tgz")
35- set(FCV_PACKAGE_HASH "fe2d30334180b17e3031eee92aac43b6")
36+ set(FCV_PACKAGE_NAME "fastcv_android_arm32_2025_04_08.tgz")
37+ set(FCV_PACKAGE_HASH "6fc1e812a4b3ef392469d2283e037ffe")
38 endif()
39 elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS)
40 if(AARCH64)
41- set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_02_12.tgz")
42- set(FCV_PACKAGE_HASH "33ac2a59cf3e7d6402eee2e010de1202")
43+ set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_04_08.tgz")
44+ set(FCV_PACKAGE_HASH "062a26639cd2788beee2e0dd8743d680")
45 else()
46 message("FastCV: fastcv lib for 32-bit Linux is not supported for now!")
47 endif()
48--
492.34.1
50
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch
new file mode 100644
index 0000000000..dd3c9a7a82
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch
@@ -0,0 +1,87 @@
1From e517347450636012e5f7a65a504e4ac9e1224c50 Mon Sep 17 00:00:00 2001
2From: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
3Date: Thu, 13 Feb 2025 09:17:08 +0300
4Subject: [PATCH] FROMLIST: Switch to static instance of FastCV on Linux.
5
6Signed-off-by: Alexander Smorkalov <alexander.smorkalov@opencv.ai>
7Upstream-Status: Submitted [https://github.com/opencv/opencv/pull/26917]
8---
9 3rdparty/fastcv/fastcv.cmake | 7 ++++---
10 cmake/OpenCVFindLibsPerf.cmake | 21 +++++++++++++++------
11 2 files changed, 19 insertions(+), 9 deletions(-)
12
13diff --git a/3rdparty/fastcv/fastcv.cmake b/3rdparty/fastcv/fastcv.cmake
14index b8172705ca..5c81c11300 100644
15--- a/3rdparty/fastcv/fastcv.cmake
16+++ b/3rdparty/fastcv/fastcv.cmake
17@@ -1,7 +1,7 @@
18 function(download_fastcv root_dir)
19
20 # Commit SHA in the opencv_3rdparty repo
21- set(FASTCV_COMMIT "dc5d58018f3af915a8d209386d2c58c0501c0f2c")
22+ set(FASTCV_COMMIT "f4413cc2ab7233fdfc383a4cded402c072677fb0")
23
24 # Define actual FastCV versions
25 if(ANDROID)
26@@ -16,14 +16,15 @@ function(download_fastcv root_dir)
27 endif()
28 elseif(UNIX AND NOT APPLE AND NOT IOS AND NOT XROS)
29 if(AARCH64)
30- set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2024_12_11.tgz")
31- set(FCV_PACKAGE_HASH "7b33ad833e6f15ab6d4ec64fa3c17acd")
32+ set(FCV_PACKAGE_NAME "fastcv_linux_aarch64_2025_02_12.tgz")
33+ set(FCV_PACKAGE_HASH "33ac2a59cf3e7d6402eee2e010de1202")
34 else()
35 message("FastCV: fastcv lib for 32-bit Linux is not supported for now!")
36 endif()
37 endif(ANDROID)
38
39 # Download Package
40+
41 set(OPENCV_FASTCV_URL "https://raw.githubusercontent.com/opencv/opencv_3rdparty/${FASTCV_COMMIT}/fastcv/")
42
43 ocv_download( FILENAME ${FCV_PACKAGE_NAME}
44diff --git a/cmake/OpenCVFindLibsPerf.cmake b/cmake/OpenCVFindLibsPerf.cmake
45index c2380e6ce5..c5fb628c44 100644
46--- a/cmake/OpenCVFindLibsPerf.cmake
47+++ b/cmake/OpenCVFindLibsPerf.cmake
48@@ -181,7 +181,14 @@ endif(WITH_KLEIDICV)
49 if(WITH_FASTCV)
50 if((EXISTS ${FastCV_INCLUDE_PATH}) AND (EXISTS ${FastCV_LIB_PATH}))
51 message(STATUS "Use external FastCV ${FastCV_INCLUDE_PATH}, ${FastCV_LIB_PATH}")
52- set(HAVE_FASTCV TRUE CACHE BOOL "FastCV status")
53+ find_library(FASTCV_LIBRARY NAMES "fastcv"
54+ PATHS "${FastCV_LIB_PATH}" NO_DEFAULT_PATH NO_CMAKE_FIND_ROOT_PATH)
55+ mark_as_advanced(FASTCV_LIBRARY)
56+ if (FASTCV_LIBRARY)
57+ set(HAVE_FASTCV TRUE CACHE BOOL "FastCV status")
58+ else()
59+ set(HAVE_FASTCV FALSE CACHE BOOL "FastCV status")
60+ endif()
61 else()
62 include("${OpenCV_SOURCE_DIR}/3rdparty/fastcv/fastcv.cmake")
63 set(FCV_ROOT_DIR "${OpenCV_BINARY_DIR}/3rdparty/fastcv")
64@@ -190,13 +197,15 @@ if(WITH_FASTCV)
65 set(FastCV_INCLUDE_PATH "${FCV_ROOT_DIR}/inc" CACHE PATH "FastCV includes directory")
66 set(FastCV_LIB_PATH "${FCV_ROOT_DIR}/libs" CACHE PATH "FastCV library directory")
67 ocv_install_3rdparty_licenses(FastCV "${OpenCV_BINARY_DIR}/3rdparty/fastcv/LICENSE")
68- install(FILES "${FastCV_LIB_PATH}/libfastcvopt.so"
69- DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "bin")
70+ if(ANDROID)
71+ set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcvopt.so" CACHE PATH "FastCV library")
72+ install(FILES "${FASTCV_LIBRARY}" DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "bin")
73+ else()
74+ set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcv.a" CACHE PATH "FastCV library")
75+ install(FILES "${FASTCV_LIBRARY}" DESTINATION "${OPENCV_LIB_INSTALL_PATH}" COMPONENT "dev")
76+ endif()
77 else()
78 set(HAVE_FASTCV FALSE CACHE BOOL "FastCV status")
79 endif()
80 endif()
81- if(HAVE_FASTCV)
82- set(FASTCV_LIBRARY "${FastCV_LIB_PATH}/libfastcvopt.so" CACHE PATH "FastCV library")
83- endif()
84 endif(WITH_FASTCV)
85--
862.34.1
87
diff --git a/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch b/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch
new file mode 100644
index 0000000000..9fc89e4244
--- /dev/null
+++ b/meta-oe/recipes-support/opencv/opencv/0001-core-fixed-VSX-intrinsics-implementation.patch
@@ -0,0 +1,61 @@
1From 97f3f390661f2fd1168336820b89eb4383ce8528 Mon Sep 17 00:00:00 2001
2From: Maksim Shabunin <maksim.shabunin@gmail.com>
3Date: Fri, 10 Jan 2025 18:34:11 +0300
4Subject: [PATCH] core: fixed VSX intrinsics implementation
5
6Upstream-Status: Backport
7[https://github.com/opencv/opencv/commit/97f3f390661f2fd1168336820b89eb4383ce8528]
8
9Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
10---
11 modules/core/include/opencv2/core/hal/intrin_vsx.hpp | 10 +++++-----
12 1 file changed, 5 insertions(+), 5 deletions(-)
13
14diff --git a/modules/core/include/opencv2/core/hal/intrin_vsx.hpp b/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
15index 2157e1e870..0a0915a22f 100644
16--- a/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
17+++ b/modules/core/include/opencv2/core/hal/intrin_vsx.hpp
18@@ -262,7 +262,7 @@ OPENCV_HAL_IMPL_VSX_EXTRACT_N(v_float64x2, double)
19 inline _Tpvec v_setzero_##suffix() { return _Tpvec(vec_splats((_Tp)0)); } \
20 inline _Tpvec v_setall_##suffix(_Tp v) { return _Tpvec(vec_splats((_Tp)v));} \
21 template <> inline _Tpvec v_setzero_() { return v_setzero_##suffix(); } \
22-template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(_Tp v); } \
23+template <> inline _Tpvec v_setall_(_Tp v) { return v_setall_##suffix(v); } \
24 template<typename _Tpvec0> inline _Tpvec v_reinterpret_as_##suffix(const _Tpvec0 &a) \
25 { return _Tpvec((cast)a.val); }
26
27@@ -650,11 +650,11 @@ OPENCV_HAL_IMPL_VSX_SELECT(v_float64x2, vec_bdword2_c)
28 #define OPENCV_HAL_IMPL_VSX_INT_CMP_OP(_Tpvec) \
29 inline _Tpvec v_eq(const _Tpvec& a, const _Tpvec& b) \
30 { return _Tpvec(vec_cmpeq(a.val, b.val)); } \
31-inline _Tpvec V_ne(const _Tpvec& a, const _Tpvec& b) \
32+inline _Tpvec v_ne(const _Tpvec& a, const _Tpvec& b) \
33 { return _Tpvec(vec_cmpne(a.val, b.val)); } \
34 inline _Tpvec v_lt(const _Tpvec& a, const _Tpvec& b) \
35 { return _Tpvec(vec_cmplt(a.val, b.val)); } \
36-inline _Tpvec V_gt(const _Tpvec& a, const _Tpvec& b) \
37+inline _Tpvec v_gt(const _Tpvec& a, const _Tpvec& b) \
38 { return _Tpvec(vec_cmpgt(a.val, b.val)); } \
39 inline _Tpvec v_le(const _Tpvec& a, const _Tpvec& b) \
40 { return _Tpvec(vec_cmple(a.val, b.val)); } \
41@@ -1507,7 +1507,7 @@ inline v_float64x2 v_dotprod_expand(const v_int32x4& a, const v_int32x4& b, cons
42 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b)
43 { return v_dotprod(a, b); }
44 inline v_int32x4 v_dotprod_fast(const v_int16x8& a, const v_int16x8& b, const v_int32x4& c)
45-{ return v_int32x4(vec_msum(a.val, b.val, vec_int4_z)) + c; }
46+{ return v_add(v_int32x4(vec_msum(a.val, b.val, vec_int4_z)), c); }
47 // 32 >> 64
48 inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b)
49 { return v_dotprod(a, b); }
50@@ -1518,7 +1518,7 @@ inline v_int64x2 v_dotprod_fast(const v_int32x4& a, const v_int32x4& b, const v_
51 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b)
52 { return v_dotprod_expand(a, b); }
53 inline v_uint32x4 v_dotprod_expand_fast(const v_uint8x16& a, const v_uint8x16& b, const v_uint32x4& c)
54-{ return v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)) + c; }
55+{ return v_add(v_uint32x4(vec_msum(a.val, b.val, vec_uint4_z)), c); }
56
57 inline v_int32x4 v_dotprod_expand_fast(const v_int8x16& a, const v_int8x16& b)
58 {
59--
602.25.1
61
diff --git a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb
index cf836d3ecf..826eff30ca 100644
--- a/meta-oe/recipes-support/opencv/opencv_4.9.0.bb
+++ b/meta-oe/recipes-support/opencv/opencv_4.11.0.bb
@@ -10,31 +10,35 @@ ARM_INSTRUCTION_SET:armv5 = "arm"
10 10
11DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" 11DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp"
12 12
13SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" 13SRCREV_opencv = "31b0eeea0b44b370fd0712312df4214d4ae1b158"
14SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" 14SRCREV_contrib = "0e5254ebf54d2aed6e7eaf6660bf3b797cf50a02"
15SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" 15SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26"
16SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" 16SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d"
17SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" 17SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12"
18SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252" 18SRCREV_wechat-qrcode = "a8b69ccc738421293254aec5ddb38bd523503252"
19SRCREV_fastcv = "8d86e68dad8b80b8575a8d3cf401d3ee96c24148"
19 20
20 21
21SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg" 22SRCREV_FORMAT = "opencv_contrib_ipp_boostdesc_vgg_fastcv"
22SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \ 23SRC_URI = "git://github.com/opencv/opencv.git;name=opencv;branch=4.x;protocol=https \
23 git://github.com/opencv/opencv_contrib.git;destsuffix=git/contrib;name=contrib;branch=4.x;protocol=https \ 24 git://github.com/opencv/opencv_contrib.git;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/contrib;name=contrib;branch=4.x;protocol=https \
24 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=git/boostdesc;name=boostdesc;protocol=https \ 25 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_boostdesc_20161012;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/boostdesc;name=boostdesc;protocol=https \
25 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=git/vgg;name=vgg;protocol=https \ 26 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_xfeatures2d_vgg_20160317;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/vgg;name=vgg;protocol=https \
26 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=git/face;name=face;protocol=https \ 27 git://github.com/opencv/opencv_3rdparty.git;branch=contrib_face_alignment_20170818;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/face;name=face;protocol=https \
27 git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=git/wechat_qrcode;name=wechat-qrcode;protocol=https \ 28 git://github.com/WeChatCV/opencv_3rdparty.git;branch=wechat_qrcode;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/wechat_qrcode;name=wechat-qrcode;protocol=https \
29 git://github.com/opencv/opencv_3rdparty.git;branch=fastcv/4.x_20250410;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/fastcv;name=fastcv;protocol=https \
28 file://0003-To-fix-errors-as-following.patch \ 30 file://0003-To-fix-errors-as-following.patch \
29 file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \ 31 file://0001-Temporarliy-work-around-deprecated-ffmpeg-RAW-functi.patch \
30 file://0001-Dont-use-isystem.patch \ 32 file://0001-Dont-use-isystem.patch \
31 file://download.patch \ 33 file://download.patch \
32 file://0001-Make-ts-module-external.patch \ 34 file://0001-Make-ts-module-external.patch \
33 file://0008-Do-not-embed-build-directory-in-binaries.patch \ 35 file://0008-Do-not-embed-build-directory-in-binaries.patch \
36 file://0001-core-fixed-VSX-intrinsics-implementation.patch \
37 file://0001-FROMLIST-Switch-to-static-instance-of-FastCV-on-Linux.patch \
38 file://0001-FROMLIST-FastCV-latest-libs-hash-update.patch \
34 " 39 "
35SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib" 40SRC_URI:append:riscv64 = " file://0001-Use-Os-to-compile-tinyxml2.cpp.patch;patchdir=contrib"
36 41
37S = "${WORKDIR}/git"
38 42
39# OpenCV wants to download more files during configure. We download these in 43# OpenCV wants to download more files during configure. We download these in
40# do_fetch and construct a source cache in the format it expects 44# do_fetch and construct a source cache in the format it expects
@@ -60,6 +64,7 @@ do_unpack_extra() {
60 cache data ${S}/face/*.dat 64 cache data ${S}/face/*.dat
61 cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel 65 cache wechat_qrcode ${S}/wechat_qrcode/*.caffemodel
62 cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt 66 cache wechat_qrcode ${S}/wechat_qrcode/*.prototxt
67 cache fastcv ${S}/fastcv/fastcv/*.tgz
63} 68}
64addtask unpack_extra after do_unpack before do_patch 69addtask unpack_extra after do_unpack before do_patch
65 70
@@ -86,7 +91,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON"
86EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" 91EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1"
87 92
88PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ 93PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \
89 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ 94 ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \
90 ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" 95 ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}"
91 96
92# TBB does not build for powerpc so disable that package config 97# TBB does not build for powerpc so disable that package config
@@ -113,20 +118,21 @@ PACKAGECONFIG[opencl] = "-DWITH_OPENCL=ON,-DWITH_OPENCL=OFF,opencl-headers virtu
113PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine" 118PACKAGECONFIG[openvino] = "-DWITH_OPENVINO=ON,-DWITH_OPENVINO=OFF,openvino-inference-engine,openvino-inference-engine"
114PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native," 119PACKAGECONFIG[oracle-java] = "-DJAVA_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_INCLUDE_PATH2=${ORACLE_JAVA_HOME}/include/linux -DJAVA_AWT_INCLUDE_PATH=${ORACLE_JAVA_HOME}/include -DJAVA_AWT_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/libjawt.so -DJAVA_JVM_LIBRARY=${ORACLE_JAVA_HOME}/lib/amd64/server/libjvm.so,,ant-native oracle-jse-jdk oracle-jse-jdk-native,"
115PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng," 120PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng,"
116PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/core/include,,python3-numpy," 121PACKAGECONFIG[python3] = "-DPYTHON3_INCLUDE_PATH=${STAGING_INCDIR}/${PYTHON_DIR}${PYTHON_ABI} -DPYTHON3_NUMPY_INCLUDE_DIRS:PATH=${STAGING_LIBDIR}/${PYTHON_DIR}/site-packages/numpy/_core/include,,python3-numpy,"
117PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,," 122PACKAGECONFIG[samples] = "-DBUILD_EXAMPLES=ON -DINSTALL_PYTHON_EXAMPLES=ON,-DBUILD_EXAMPLES=OFF,,"
118PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb," 123PACKAGECONFIG[tbb] = "-DWITH_TBB=ON,-DWITH_TBB=OFF,tbb,"
119PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,," 124PACKAGECONFIG[tests] = "-DBUILD_TESTS=ON,-DBUILD_TESTS=OFF,,"
120PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract," 125PACKAGECONFIG[text] = "-DBUILD_opencv_text=ON,-DBUILD_opencv_text=OFF,tesseract,"
121PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff," 126PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff,"
122PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils," 127PACKAGECONFIG[v4l] = "-DWITH_V4L=ON,-DWITH_V4L=OFF,v4l-utils,"
128PACKAGECONFIG[fastcv] = "-DWITH_FASTCV=ON ,-DWITH_FASTCV=OFF,,"
123 129
124inherit pkgconfig cmake setuptools3-base python3native 130inherit pkgconfig cmake setuptools3-base python3native
125 131
126export PYTHON_CSPEC="-I${STAGING_INCDIR}/${PYTHON_DIR}" 132export PYTHON_CSPEC = "-I${STAGING_INCDIR}/${PYTHON_DIR}"
127export ORACLE_JAVA_HOME="${STAGING_DIR_NATIVE}/usr/bin/java" 133export ORACLE_JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/bin/java"
128export JAVA_HOME="${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native" 134export JAVA_HOME = "${STAGING_DIR_NATIVE}/usr/lib/jvm/openjdk-8-native"
129export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" 135export ANT_DIR = "${STAGING_DIR_NATIVE}/usr/share/ant/"
130 136
131TARGET_CC_ARCH += "-I${S}/include " 137TARGET_CC_ARCH += "-I${S}/include "
132 138
@@ -207,4 +213,10 @@ do_install:append() {
207 if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then 213 if [ -f ${D}${bindir}/setup_vars_opencv4.sh ]; then
208 rm -rf ${D}${bindir}/setup_vars_opencv4.sh 214 rm -rf ${D}${bindir}/setup_vars_opencv4.sh
209 fi 215 fi
216
217 for fn in arithm.vsx3.cpp convert.vsx3.cpp; do
218 if [ -f ${B}/modules/core/$fn ]; then
219 sed -i -e 's,${S},/usr/src/debug/${PN}/${PV},g' ${B}/modules/core/$fn
220 fi
221 done
210} 222}
diff --git a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
index c229667d68..9ef4a83584 100644
--- a/meta-oe/recipes-support/openldap/openldap_2.6.7.bb
+++ b/meta-oe/recipes-support/openldap/openldap_2.6.10.bb
@@ -4,10 +4,10 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html"
4# The OpenLDAP Public License - see the HOMEPAGE - defines 4# The OpenLDAP Public License - see the HOMEPAGE - defines
5# the license. www.openldap.org claims this is Open Source 5# the license. www.openldap.org claims this is Open Source
6# (see http://www.openldap.org), the license appears to be 6# (see http://www.openldap.org), the license appears to be
7# basically BSD. opensource.org does not record this license 7# basically BSD. opensource.org has listed this license
8# at present (so it is apparently not OSI certified). 8# since August 2019.
9LICENSE = "OpenLDAP" 9LICENSE = "OLDAP-2.8"
10LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ 10LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \
11 file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ 11 file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \
12 " 12 "
13SECTION = "libs" 13SECTION = "libs"
@@ -21,7 +21,7 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$
21 file://0001-build-top.mk-unset-STRIP_OPTS.patch \ 21 file://0001-build-top.mk-unset-STRIP_OPTS.patch \
22" 22"
23 23
24SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" 24SRC_URI[sha256sum] = "c065f04aad42737aebd60b2fe4939704ac844266bc0aeaa1609f0cad987be516"
25 25
26DEPENDS = "util-linux groff-native" 26DEPENDS = "util-linux groff-native"
27 27
diff --git a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb b/meta-oe/recipes-support/opensc/opensc_0.26.1.bb
index 19fb78092e..78258c965a 100644
--- a/meta-oe/recipes-support/opensc/opensc_0.25.1.bb
+++ b/meta-oe/recipes-support/opensc/opensc_0.26.1.bb
@@ -5,24 +5,24 @@ functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\
5keys on the smart card is possible with PKCS\ 5keys on the smart card is possible with PKCS\
6such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ 6such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\
7eID cards have also been confirmed to work." 7eID cards have also been confirmed to work."
8
9HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" 8HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki"
10SECTION = "System Environment/Libraries" 9SECTION = "System Environment/Libraries"
11LICENSE = "LGPL-2.0-or-later" 10LICENSE = "LGPL-2.1-or-later"
12LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" 11LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7"
12DEPENDS = "openssl"
13
14SRCREV = "043343d2df7b09d1938bc3dc313d86a96be457cc"
15SRC_URI = "git://github.com/OpenSC/OpenSC;branch=0.26.1;protocol=https"
16
17CVE_STATUS[CVE-2024-8443] = "fixed-version: this is fixed since 0.26.0"
13 18
14#v0.21.0
15SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6"
16SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https"
17DEPENDS = "virtual/libiconv openssl"
18 19
19S = "${WORKDIR}/git"
20inherit autotools pkgconfig bash-completion 20inherit autotools pkgconfig bash-completion
21 21
22EXTRA_OECONF = " \ 22EXTRA_OECONF = " \
23 --disable-static \
24 --disable-ctapi \ 23 --disable-ctapi \
25 --disable-doc \ 24 --disable-doc \
25 --disable-static \
26 --disable-strict \ 26 --disable-strict \
27" 27"
28EXTRA_OEMAKE = "DESTDIR=${D}" 28EXTRA_OEMAKE = "DESTDIR=${D}"
@@ -31,12 +31,10 @@ PACKAGECONFIG ??= "pcsc"
31 31
32PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" 32PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct"
33PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" 33PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib"
34 34PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline"
35RDEPENDS:${PN} = "readline"
36 35
37FILES:${PN} += "\ 36FILES:${PN} += "\
38 ${libdir}/opensc-pkcs11.so \ 37 ${libdir}/opensc-pkcs11.so \
39 ${libdir}/onepin-opensc-pkcs11.so \
40 ${libdir}/pkcs11-spy.so \ 38 ${libdir}/pkcs11-spy.so \
41" 39"
42FILES:${PN}-dev += "\ 40FILES:${PN}-dev += "\
diff --git a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
index 1c5a18e863..02815ec7ba 100644
--- a/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
+++ b/meta-oe/recipes-support/opensync/wbxml2_0.10.8.bb
@@ -8,10 +8,9 @@ DEPENDS = "expat"
8 8
9SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz" 9SRC_URI = "${SOURCEFORGE_MIRROR}/libwbxml/libwbxml-${PV}.tar.gz"
10 10
11SRC_URI[md5sum] = "f5031e9f730ffd9dc6a2d1ded585e1d1"
12SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d" 11SRC_URI[sha256sum] = "a057daa098f12838eb4e635bb28413027f1b73819872c3fbf64e3207790a3f7d"
13 12
14S = "${WORKDIR}/libwbxml-${PV}" 13S = "${UNPACKDIR}/libwbxml-${PV}"
15 14
16inherit cmake pkgconfig 15inherit cmake pkgconfig
17 16
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb
deleted file mode 100644
index 88033e58cc..0000000000
--- a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "Open Telemetry Library"
2DESCRIPTION = "An Observability framework to create and manage telemetry data \
3such as traces, metrics, and logs."
4HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp"
5SECTION = "libs"
6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
8
9DEPENDS = "nlohmann-json"
10
11SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;"
12SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31"
13
14S = "${WORKDIR}/git"
15inherit cmake pkgconfig lib_package
16
17PACKAGECONFIG ?= "opentelemety_install otlp_api"
18
19PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF"
20PACKAGECONFIG[build_package]="-DBUILD_PACKAGE=ON,-DBUILD_PACKAGE=OFF"
21PACKAGECONFIG[otlp_api]="-DWITH_OTLP_API=ON,-DWITH_OTLP_API=OFF"
22PACKAGECONFIG[otlp_grpc]="-DWITH_OTLP_GRPC=ON,-DWITH_OTLP_GRPC=OFF"
23PACKAGECONFIG[otlp_http]="-DWITH_OTLP_HTTP=ON,-DWITH_OTLP_HTTP=OFF"
24PACKAGECONFIG[otlp_prometheus]="-DWITH_PROMETHEUS=ON,-DWITH_PROMETHEUS=OFF"
25PACKAGECONFIG[benchmark]="-DWITH_BENCHMARK=ON,-DWITH_BENCHMARK=OFF"
26PACKAGECONFIG[testing]="-DBUILD_TESTING=ON,-DBUILD_TESTING=OFF"
diff --git a/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb
new file mode 100644
index 0000000000..eb108c177c
--- /dev/null
+++ b/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.20.0.bb
@@ -0,0 +1,30 @@
1SUMMARY = "Open Telemetry Library"
2DESCRIPTION = "An Observability framework to create and manage telemetry data \
3such as traces, metrics, and logs."
4HOMEPAGE = "https://github.com/open-telemetry/opentelemetry-cpp"
5SECTION = "libs"
6LICENSE = "Apache-2.0"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327"
8
9DEPENDS = "nlohmann-json"
10SRC_URI = "gitsm://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;tag=v${PV}"
11SRCREV = "6175aa0b213eea053247e43b4f35b8d201fa356e"
12
13inherit cmake pkgconfig lib_package
14
15LDFLAGS:append:riscv32 = " -latomic"
16
17EXTRA_OECMAKE:append = " -DPROTOBUF_PROTOC_EXECUTABLE=${RECIPE_SYSROOT_NATIVE}${bindir}/protoc \
18 -DOTELCPP_VERSIONED_LIBS=ON \
19 -DBUILD_SHARED_LIBS=ON "
20
21PACKAGECONFIG ?= "opentelemetry_install otlp_api"
22
23PACKAGECONFIG[opentelemetry_install] = "-DOPENTELEMETRY_INSTALL=ON, -DOPENTELEMETRY_INSTALL=OFF"
24PACKAGECONFIG[otlp_api] = "-DWITH_OTLP_API=ON, -DWITH_OTLP_API=OFF"
25PACKAGECONFIG[otlp_grpc] = "-DWITH_OTLP_GRPC=ON -DWITH_ABSEIL=ON, -DWITH_OTLP_GRPC=OFF, grpc grpc-native protobuf-native"
26PACKAGECONFIG[otlp_http] = "-DWITH_OTLP_HTTP=ON -DWITH_ABSEIL=ON, -DWITH_OTLP_HTTP=OFF, protobuf protobuf-native curl"
27PACKAGECONFIG[otlp_prometheus] = "-DWITH_PROMETHEUS=ON -DUSE_THIRDPARTY_LIBRARIES=OFF, \
28 -DWITH_PROMETHEUS=OFF, civetweb curl"
29PACKAGECONFIG[benchmark] = "-DWITH_BENCHMARK=ON, -DWITH_BENCHMARK=OFF"
30PACKAGECONFIG[testing] = "-DBUILD_TESTING=ON, -DBUILD_TESTING=OFF, gtest"
diff --git a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
index c6a3079ea2..0b5740c161 100644
--- a/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
+++ b/meta-oe/recipes-support/p910nd/p910nd_0.97.bb
@@ -10,7 +10,6 @@ SRCREV = "57ebc07ad8723ea4106090536c58c7f7160743e2"
10SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \ 10SRC_URI = "git://github.com/kenyapcomau/p910nd;protocol=https;branch=master \
11 file://fix-var-lock.patch" 11 file://fix-var-lock.patch"
12 12
13S = "${WORKDIR}/git"
14 13
15inherit update-rc.d 14inherit update-rc.d
16 15
diff --git a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
index 2f37b099b4..806ef668e2 100644
--- a/meta-oe/recipes-support/pcp/pcp-native_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp-native_6.3.7.bb
@@ -44,5 +44,6 @@ do_install () {
44 PCP_LIBADM_DIR=${D}/${libdir} \ 44 PCP_LIBADM_DIR=${D}/${libdir} \
45 PCP_LIB_DIR=${D}/${libdir} \ 45 PCP_LIB_DIR=${D}/${libdir} \
46 PCP_MAN_DIR=${D}/${mandir} \ 46 PCP_MAN_DIR=${D}/${mandir} \
47 PCP_DOC_DIR=${D}/${docdir} 47 PCP_DOC_DIR=${D}/${docdir} \
48 PCP_SYSTEMDUNIT_DIR=${D}${systemd_system_unitdir}
48} 49}
diff --git a/meta-oe/recipes-support/pcp/pcp.inc b/meta-oe/recipes-support/pcp/pcp.inc
index 4cafa7234b..c54c054cf8 100644
--- a/meta-oe/recipes-support/pcp/pcp.inc
+++ b/meta-oe/recipes-support/pcp/pcp.inc
@@ -7,12 +7,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=37ab75b580d5aad4ada04260efa3702f \
7 " 7 "
8COMPATIBLE_HOST:libc-musl = "null" 8COMPATIBLE_HOST:libc-musl = "null"
9 9
10SRC_URI = "https://performancecopilot.jfrog.io/artifactory/pcp-source-release/${BP}.src.tar.gz \ 10SRC_URI = "git://github.com/performancecopilot/pcp;branch=stable;protocol=https \
11 file://0001-configure-Limit-the-header-search-to-sysroot.patch \ 11 file://0001-configure-Limit-the-header-search-to-sysroot.patch \
12 file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \ 12 file://0001-htop-Change-dependency-order-of-header-and-sourcefil.patch \
13 file://config.linux \ 13 file://config.linux \
14 " 14 "
15SRC_URI[sha256sum] = "dacf92ba195f1f2ea8f40bf0c455d2cd2456273a1e30dcc3ee5b5bfd099a99ee" 15
16SRCREV = "d8d97b79ee47d9dfb076a3242564ed3cae04eba9"
17
16 18
17inherit setuptools3-base pkgconfig autotools-brokensep 19inherit setuptools3-base pkgconfig autotools-brokensep
18 20
@@ -36,5 +38,3 @@ EXTRA_OECONF:append = "\
36PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d" 38PACKAGECONFIG[qt5] = "--with-qt=yes --with-qt3d=yes,--with-qt=no --with-qt3d=no,qtbase qt3d"
37 39
38PACKAGECONFIG ?= "" 40PACKAGECONFIG ?= ""
39
40PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
new file mode 100644
index 0000000000..32b9252542
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-bind2-Use-pmcpp-from-native-builds.patch
@@ -0,0 +1,30 @@
1From 4c79ea13b8456155e1acd6a53a2586b6c2c32e05 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 3 May 2025 14:27:30 -0700
4Subject: [PATCH] bind2: Use pmcpp from native builds
5
6This is needed for cross compiling. Fixes
7| ./mk.rewrite
8| ./mk.rewrite: line 41: ../../pmcpp/pmcpp.static: No such file or directory
9| Error: pmcpp failed
10| make[3]: *** [GNUmakefile:54: rewrite.conf] Error 1
11
12Upstream-Status: Inappropriate [Cross-compiling specific]
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 src/pmdas/bind2/mk.rewrite | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/pmdas/bind2/mk.rewrite b/src/pmdas/bind2/mk.rewrite
19index 36e8dc1e61..142a75a824 100755
20--- a/src/pmdas/bind2/mk.rewrite
21+++ b/src/pmdas/bind2/mk.rewrite
22@@ -38,7 +38,7 @@ inlist == 1 { print }' \
23 -e 's/[ ][ ]*\([0-9][0-9]*\)/ { pmid -> BIND2.0.\1 }/' \
24 ) >$tmp.tmp
25
26-if PCP_CONF=../../include/pcp.conf ../../pmcpp/pmcpp.static -P <$tmp.tmp >>rewrite.conf
27+if PCP_CONF=../../include/pcp.conf pmcpp -P <$tmp.tmp >>rewrite.conf
28 then
29 :
30 else
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
index 009dfe2d04..2915d48f04 100644
--- a/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
+++ b/meta-oe/recipes-support/pcp/pcp/0001-htop-Change-dependency-order-of-header-and-sourcefil.patch
@@ -16,14 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
16 src/pcp/htop/GNUmakefile | 4 ++-- 16 src/pcp/htop/GNUmakefile | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-) 17 1 file changed, 2 insertions(+), 2 deletions(-)
18 18
19diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
20index 6b7c0c5..5153c63 100644
21--- a/src/pcp/htop/GNUmakefile 19--- a/src/pcp/htop/GNUmakefile
22+++ b/src/pcp/htop/GNUmakefile 20+++ b/src/pcp/htop/GNUmakefile
23@@ -186,8 +186,8 @@ CFGMETERS = $(patsubst %,pcp/meters/%,$(METERS)) 21@@ -210,8 +210,8 @@ CFGCOLUMNS = $(patsubst %,pcp/columns/%,
24 CFGCOLUMNS = $(patsubst %,pcp/columns/%,$(COLUMNS)) 22 CFGSCREENS = $(patsubst %,pcp/screens/%,$(SCREENS))
25 23
26 CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) 24 CFGXFILES = $(CFGMETERS) $(CFGCOLUMNS) $(CFGSCREENS)
27-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES) 25-TOPXFILES = $(TOPCFILES) $(TOPHFILES) $(DOCFILES)
28-SUBXFILES = $(SUBCFILES) $(SUBHFILES) 26-SUBXFILES = $(SUBCFILES) $(SUBHFILES)
29+TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES) 27+TOPXFILES = $(TOPHFILES) $(TOPCFILES) $(DOCFILES)
@@ -31,6 +29,3 @@ index 6b7c0c5..5153c63 100644
31 CFILES = $(TOPCFILES) $(SUBCFILES) 29 CFILES = $(TOPCFILES) $(SUBCFILES)
32 HFILES = $(TOPHFILES) $(SUBHFILES) 30 HFILES = $(TOPHFILES) $(SUBHFILES)
33 LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \ 31 LDIRT = $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) \
34--
352.41.0
36
diff --git a/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
new file mode 100644
index 0000000000..2c3cf696ed
--- /dev/null
+++ b/meta-oe/recipes-support/pcp/pcp/0001-pcp-htop-fix-header-build-race-condition.patch
@@ -0,0 +1,33 @@
1From d04ea418c5fcfec2f6fbb2dd9f982ddf12c5be87 Mon Sep 17 00:00:00 2001
2From: Yoann Congal <yoann.congal@smile.fr>
3Date: Tue, 3 Jun 2025 10:02:58 +0200
4Subject: [PATCH] pcp-htop: fix header build race condition
5
6.c and .h files are soft-linked before being compiled. Under heavy load
7or a build with a high CPU count, the compilation can start before
8header files are softlinked, resulting in a build error:
9| pcp-htop.c:13:10: fatal error: CommandLine.h: No such file or directory
10| 13 | #include "CommandLine.h"
11| | ^~~~~~~~~~~~~~~
12
13Fix this by adding the make dependency between object files and the
14headers.
15
16Upstream-Status: Backport [https://github.com/performancecopilot/pcp/commit/0ca303467ce382127cd9676e288bf7690a93f084]
17Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
18---
19 src/pcp/htop/GNUmakefile | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/src/pcp/htop/GNUmakefile b/src/pcp/htop/GNUmakefile
23index 3e29638d6..898f0b766 100644
24--- a/src/pcp/htop/GNUmakefile
25+++ b/src/pcp/htop/GNUmakefile
26@@ -224,6 +224,7 @@ default: build-me
27 include $(BUILDRULES)
28
29 ifeq "$(HAVE_NCURSESW)" "true"
30+$(OBJECTS): $(HFILES)
31 build-me: $(TOPXFILES) $(SUBXFILES) $(CFGXFILES) $(CMDTARGET) $(DISTLINKS) $(MAN_PAGES)
32
33 install: default
diff --git a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
index 9cb649a594..7bc045949b 100644
--- a/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
+++ b/meta-oe/recipes-support/pcp/pcp/fix_parallel_make.patch
@@ -1,13 +1,113 @@
1Upstream-Status: Pending 1From 92add24ccfc7e643349a1c091957595ce25a9915 Mon Sep 17 00:00:00 2001
2From: Yoann Congal <yoann.congal@smile.fr>
3Date: Tue, 27 May 2025 08:45:36 +0200
4Subject: [PATCH] QA: cleanup localconfig.h build dependencies
2 5
6Some QA binaries include localconfig.h but there is no explicit dependencies
7between the binary build and the localconfig.h generation.
8On heavily loaded systems, this can result in the binary being built
9before localconf.h and a compilation error, e.g:
10| username.c:8:10: fatal error: localconfig.h: No such file or directory
11| 8 | #include "localconfig.h"
12| | ^~~~~~~~~~~~~~~
13| compilation terminated.
14
15This can be reproduced by adding "sleep 30" at the start of the
16localconfig.h generation rule.
17
18Fix this by adding the missing Makefile rule dependency between the
19binary (or its pre-link .o) and localconfig.h.
20
21Also remove an un-needed scale.o->localconfig.h dependency.
22
23Upstream-Status: Backport [https://github.com/performancecopilot/pcp/commit/8de7bbb06703f224b72fe0994acde3189b742fd2]
24Signed-off-by: Yoann Congal <yoann.congal@smile.fr>
25---
26 qa/src/GNUlocaldefs | 22 +++++++++++-----------
27 1 file changed, 11 insertions(+), 11 deletions(-)
28
29diff --git a/qa/src/GNUlocaldefs b/qa/src/GNUlocaldefs
30index f83826068..e47fbfd72 100644
3--- a/qa/src/GNUlocaldefs 31--- a/qa/src/GNUlocaldefs
4+++ b/qa/src/GNUlocaldefs 32+++ b/qa/src/GNUlocaldefs
5@@ -728,7 +728,7 @@ scale.o: localconfig.h 33@@ -299,7 +299,7 @@ diowr: diowr.c
34 rm -f $@
35 $(CCF) $(CDEFS) -o $@ diowr.c
36
37-endian: endian.c
38+endian: endian.c localconfig.h
39 rm -f $@
40 $(CCF) $(CDEFS) -o $@ endian.c
41
42@@ -331,15 +331,15 @@ exercise: exercise.c
43 rm -f $@
44 $(CCF) $(CDEFS) -o $@ exercise.c $(LDLIBS)
45
46-chkacc1: chkacc1.c
47+chkacc1: chkacc1.c localconfig.h
48 rm -f $@
49 $(CCF) $(CDEFS) -o $@ chkacc1.c $(LDLIBS)
50
51-chkacc2: chkacc2.c
52+chkacc2: chkacc2.c localconfig.h
53 rm -f $@
54 $(CCF) $(CDEFS) -o $@ chkacc2.c $(LDLIBS)
55
56-chkacc3: chkacc3.c
57+chkacc3: chkacc3.c localconfig.h
58 rm -f $@
59 $(CCF) $(CDEFS) -o $@ chkacc3.c $(LDLIBS)
60
61@@ -489,7 +489,7 @@ pmdashutdown: pmdashutdown.c
62 rm -f $@
63 $(CCF) $(CDEFS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
64
65-dumb_pmda: dumb_pmda.c
66+dumb_pmda: dumb_pmda.c localconfig.h
67 $(CCF) $(LCDEFS) $(LCOPTS) -o $@ $@.c $(LDLIBS) -lpcp_pmda
68
69 pmdacache: pmdacache.c
70@@ -633,7 +633,7 @@ else
71 $(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
72 endif
73
74-multithread2: multithread2.c
75+multithread2: multithread2.c localconfig.h
76 rm -f $@
77 $(CCF) $(CDEFS) -o $@ $@.c $(LIB_FOR_PTHREADS) $(LDLIBS)
78
79@@ -786,7 +786,6 @@ $(NVIDIAQALIB): nvidia-ml.o
80 endif
81
82 arch_maxfd.o: localconfig.h
83-scale.o: localconfig.h
84
6 779246.o: libpcp.h 85 779246.o: libpcp.h
7 aggrstore.o: libpcp.h 86 aggrstore.o: libpcp.h
8 badmmv.o: libpcp.h 87@@ -847,14 +846,14 @@ multithread14.o: libpcp.h
9-chkacc1.o: libpcp.h 88 nameall.o: libpcp.h
10+chkacc1.o: libpcp.h localconfig.h 89 parsehostattrs.o: libpcp.h
11 chkacc2.o: libpcp.h 90 parsehostspec.o: libpcp.h
12 chkacc3.o: libpcp.h 91-pdubufbounds.o: libpcp.h
13 chkacc4.o: libpcp.h 92-pducheck.o: libpcp.h
93+pdubufbounds.o: libpcp.h localconfig.h
94+pducheck.o: libpcp.h localconfig.h
95 pducrash.o: libpcp.h
96-pdu-server.o: libpcp.h
97+pdu-server.o: libpcp.h localconfig.h
98 pmcdgone.o: libpcp.h
99 pmlcmacro.o: libpcp.h
100 pmnsinarchives.o: libpcp.h
101-pmnsunload.o: libpcp.h
102+pmnsunload.o: libpcp.h localconfig.h
103 proc_test.o: libpcp.h
104 qa_libpcp_compat.o: libpcp.h
105 qa_timezone.o: libpcp.h
106@@ -874,6 +873,7 @@ torture_pmns.o: libpcp.h
107 tztest.o: libpcp.h
108 unpack.o: libpcp.h
109 unpickargs.o: libpcp.h
110+username.o: localconfig.h
111 xarch.o: libpcp.h
112 xlog.o: libpcp.h
113 xmktime.o: libpcp.h
diff --git a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
index 10545b65ea..65efac06be 100644
--- a/meta-oe/recipes-support/pcp/pcp_6.0.5.bb
+++ b/meta-oe/recipes-support/pcp/pcp_6.3.7.bb
@@ -13,12 +13,17 @@ DEPENDS += "perl-native bison-native flex-native python3-native python3-setuptoo
13SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \ 13SRC_URI += "file://0001-Remove-unsuitble-part-for-cross-compile.patch \
14 file://pass-options-to-AR.patch \ 14 file://pass-options-to-AR.patch \
15 file://fix_parallel_make.patch \ 15 file://fix_parallel_make.patch \
16 file://0001-bind2-Use-pmcpp-from-native-builds.patch \
17 file://0001-pcp-htop-fix-header-build-race-condition.patch \
16 " 18 "
17 19
18export PCP_DIR="${RECIPE_SYSROOT_NATIVE}" 20export PCP_DIR = "${RECIPE_SYSROOT_NATIVE}"
19#export PCP_RUN_DIR="${RECIPE_SYSROOT_NATIVE}" 21#export PCP_RUN_DIR = "${RECIPE_SYSROOT_NATIVE}"
20EXTRA_OEMAKE = "CC="${CC}" LD="${LD}"" 22EXTRA_OEMAKE = '\
21inherit useradd systemd features_check python3targetconfig 23 CC="${CC}" LD="${LD}" CROSS_COMPILING="yes" \
24 PCP_SYSTEMDUNIT_DIR=${systemd_system_unitdir} \
25'
26inherit useradd systemd features_check python3targetconfig gtk-icon-cache
22 27
23# Needs libx11 28# Needs libx11
24REQUIRED_DISTRO_FEATURES = "x11" 29REQUIRED_DISTRO_FEATURES = "x11"
@@ -48,6 +53,7 @@ USERADD_PARAM:${PN}-testsuite = "--system --home ${localstatedir}/lib/pcp/testsu
48 --user-group pcpqa" 53 --user-group pcpqa"
49 54
50RDEPENDS:${PN} += "perl" 55RDEPENDS:${PN} += "perl"
56RDEPENDS:${PN}-xsos += "${PN} bash"
51RDEPENDS:${PN}-testsuite += "${PN} bash perl" 57RDEPENDS:${PN}-testsuite += "${PN} bash perl"
52RDEPENDS:python3-${PN} += "${PN} python3" 58RDEPENDS:python3-${PN} += "${PN} python3"
53 59
@@ -69,6 +75,7 @@ do_compile:prepend() {
69 ${S}/src/include/builddefs 75 ${S}/src/include/builddefs
70 sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile 76 sed -i -e "s,TOPDIR)/python3-pcp.list,TOPDIR)/python3-pcp.list --install-lib=${PYTHON_SITEPACKAGES_DIR},g" ${S}/src/python/GNUmakefile
71 export PYTHON=python3 77 export PYTHON=python3
78 export PATH=${PATH}:${RECIPE_SYSROOT_NATIVE}${libexecdir}/pcp/bin
72 #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3 79 #export PYTHON3=${STAGING_BINDIR_NATIVE}/python3-native/python3
73} 80}
74 81
@@ -85,17 +92,18 @@ do_install () {
85 rm -rf ${D}${localstatedir}/lib/pcp/pmcd 92 rm -rf ${D}${localstatedir}/lib/pcp/pmcd
86 rm -rf ${D}${localstatedir}/lib/pcp/tmp 93 rm -rf ${D}${localstatedir}/lib/pcp/tmp
87 rm -rf ${D}${localstatedir}/run 94 rm -rf ${D}${localstatedir}/run
88 mv ${D}${docdir}/C* ${D}${docdir}/pcp-doc/
89 mv ${D}${docdir}/I* ${D}${docdir}/pcp-doc/
90 mv ${D}${docdir}/R* ${D}${docdir}/pcp-doc/
91 mv ${D}${docdir}/V* ${D}${docdir}/pcp-doc/
92 sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf 95 sed -i "s#PCP_AWK_PROG=.*#PCP_AWK_PROG=awk#" ${D}/${sysconfdir}/pcp.conf
93 sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf 96 sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf
94 sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf 97 sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf
95 sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf 98 sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf
99 sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf
100 sed -i -e 's#${RECIPE_SYSROOT}##g' \
101 -e 's#${RECIPE_SYSROOT_NATIVE}##g' \
102 -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs
96} 103}
97 104
98PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ 105PACKAGE_BEFORE_PN = "${PN}-xsos"
106PACKAGES =+ " ${PN}-export-zabbix-agent ${PN}-testsuite \
99 libpcp-gui2 libpcp-gui2-dev \ 107 libpcp-gui2 libpcp-gui2-dev \
100 libpcp-import1 libpcp-archive1 \ 108 libpcp-import1 libpcp-archive1 \
101 libpcp-mmv1 libpcp-mmv1-dev \ 109 libpcp-mmv1 libpcp-mmv1-dev \
@@ -105,7 +113,7 @@ PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \
105 libpcp3 libpcp3-dev python3-${PN}\ 113 libpcp3 libpcp3-dev python3-${PN}\
106" 114"
107FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \ 115FILES:libpcp-gui2 = "${libdir}/libpcp_gui.so.2 \
108" 116"
109FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \ 117FILES:libpcp-archive1 = "${libdir}/libpcp_archive.so.1 \
110" 118"
111FILES:libpcp-gui2-dev = " \ 119FILES:libpcp-gui2-dev = " \
@@ -114,6 +122,8 @@ FILES:libpcp-gui2-dev = " \
114 ${includedir}/pmafm.h \ 122 ${includedir}/pmafm.h \
115 ${includedir}/pmtime.h \ 123 ${includedir}/pmtime.h \
116" 124"
125INSANE_SKIP:libpcp-gui2-dev = "staticdev"
126
117FILES:libpcp-mmv1 = " \ 127FILES:libpcp-mmv1 = " \
118 ${libdir}/libpcp_mmv.so.1 \ 128 ${libdir}/libpcp_mmv.so.1 \
119" 129"
@@ -126,6 +136,8 @@ FILES:libpcp-mmv1-dev = " \
126 ${datadir}/man/man3/mmv_* \ 136 ${datadir}/man/man3/mmv_* \
127 ${datadir}/man/man5/mmv.5.gz \ 137 ${datadir}/man/man5/mmv.5.gz \
128" 138"
139INSANE_SKIP:libpcp-mmv1-dev = "staticdev"
140
129FILES:libpcp-import1 = " \ 141FILES:libpcp-import1 = " \
130 ${libdir}/libpcp_import.so.1 \ 142 ${libdir}/libpcp_import.so.1 \
131" 143"
@@ -141,6 +153,8 @@ FILES:libpcp-pmda3-dev = " \
141 ${datadir}/man/man3/PMDA.3.gz \ 153 ${datadir}/man/man3/PMDA.3.gz \
142 ${datadir}/man/man3/pmda* \ 154 ${datadir}/man/man3/pmda* \
143" 155"
156INSANE_SKIP:libpcp-pmda3-dev = "staticdev"
157
144FILES:libpcp-trace2 = " \ 158FILES:libpcp-trace2 = " \
145 ${libdir}/libpcp_trace.so.2 \ 159 ${libdir}/libpcp_trace.so.2 \
146" 160"
@@ -151,6 +165,8 @@ FILES:libpcp-trace2-dev = " \
151 ${libdir}/libpcp_trace.so \ 165 ${libdir}/libpcp_trace.so \
152 ${datadir}/man/man3/pmtrace* \ 166 ${datadir}/man/man3/pmtrace* \
153" 167"
168INSANE_SKIP:libpcp-trace2-dev = "staticdev"
169
154FILES:libpcp-web1 = " \ 170FILES:libpcp-web1 = " \
155 ${libdir}/libpcp_web.so.1 \ 171 ${libdir}/libpcp_web.so.1 \
156" 172"
@@ -162,10 +178,15 @@ FILES:libpcp-web1-dev = " \
162 ${datadir}/man/man3/pmhttp* \ 178 ${datadir}/man/man3/pmhttp* \
163 ${datadir}/man/man3/pmjson* \ 179 ${datadir}/man/man3/pmjson* \
164" 180"
181INSANE_SKIP:libpcp-web1-dev = "staticdev"
182
165FILES:libpcp3 = " \ 183FILES:libpcp3 = " \
166 ${libdir}/libpcp.so.3 \ 184 ${libdir}/libpcp.so.3 \
167" 185"
168 186
187FILES:${PN}-xsos = " \
188 ${libexecdir}/pcp/bin/pcp-xsos \
189"
169FILES:${PN} = " \ 190FILES:${PN} = " \
170 ${sysconfdir}/pcp \ 191 ${sysconfdir}/pcp \
171 ${sysconfdir}/cron.d \ 192 ${sysconfdir}/cron.d \
@@ -175,6 +196,7 @@ FILES:${PN} = " \
175 ${datadir}/bash-completion \ 196 ${datadir}/bash-completion \
176 ${datadir}/pcp-gui \ 197 ${datadir}/pcp-gui \
177 ${datadir}/zsh \ 198 ${datadir}/zsh \
199 ${datadir}/icons \
178 ${systemd_system_unitdir}/ \ 200 ${systemd_system_unitdir}/ \
179 ${libdir}/pcp/ \ 201 ${libdir}/pcp/ \
180 ${libdir}/sysusers.d/pcp.conf \ 202 ${libdir}/sysusers.d/pcp.conf \
@@ -188,6 +210,7 @@ FILES:${PN} = " \
188 ${localstatedir}/lib/pcp/pmdas/ \ 210 ${localstatedir}/lib/pcp/pmdas/ \
189 ${localstatedir}/lib/pcp/pmns \ 211 ${localstatedir}/lib/pcp/pmns \
190 ${libdir}/libpcp_fault.so.3 \ 212 ${libdir}/libpcp_fault.so.3 \
213 ${nonarch_libdir}/tmpfiles.d/pcp-reboot-init.conf \
191" 214"
192 215
193FILES:${PN}-export-zabbix-agent += " \ 216FILES:${PN}-export-zabbix-agent += " \
@@ -196,6 +219,8 @@ FILES:${PN}-export-zabbix-agent += " \
196 ${mandir}/man3/zbxpcp.3.gz \ 219 ${mandir}/man3/zbxpcp.3.gz \
197 ${libdir}/zabbix \ 220 ${libdir}/zabbix \
198" 221"
222INSANE_SKIP:${PN}-export-zabbix-agent = "dev-so"
223
199FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf" 224FILES:${PN}-testsuite = "${localstatedir}/lib/pcp/testsuite/ ${libdir}/sysusers.d/pcp-testsuite.conf"
200FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}" 225FILES:python3-${PN} = "${PYTHON_SITEPACKAGES_DIR}"
201FILES:${PN}-dev += " \ 226FILES:${PN}-dev += " \
diff --git a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
index d5a560a6a0..169630d319 100644
--- a/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
+++ b/meta-oe/recipes-support/pcsc-lite/pcsc-lite_2.0.3.bb
@@ -21,7 +21,7 @@ EXTRA_OECONF = " \
21 --enable-usbdropdir=${libdir}/pcsc/drivers \ 21 --enable-usbdropdir=${libdir}/pcsc/drivers \
22" 22"
23 23
24S = "${WORKDIR}/pcsc-lite-${PV}" 24S = "${UNPACKDIR}/pcsc-lite-${PV}"
25 25
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev" 26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)} udev"
27PACKAGECONFIG:class-native ??= "" 27PACKAGECONFIG:class-native ??= ""
diff --git a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb
index 97a94ec973..14ffab6128 100644
--- a/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb
+++ b/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb
@@ -5,11 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f"
5 5
6SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" 6SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master"
7 7
8SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" 8SRCREV = "778da3d86a59f5166443118c158e11ba4da9a5f1"
9 9
10inherit autotools pkgconfig 10inherit autotools pkgconfig
11 11
12S = "${WORKDIR}/git"
13 12
14DEPENDS = "pcsc-lite autoconf-archive-native" 13DEPENDS = "pcsc-lite autoconf-archive-native"
15 14
diff --git a/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-oe/recipes-support/picocom/picocom_2024.bb
index cc0d88faca..37cf2d0a4c 100644
--- a/meta-oe/recipes-support/picocom/picocom_git.bb
+++ b/meta-oe/recipes-support/picocom/picocom_2024.bb
@@ -4,17 +4,13 @@ LICENSE = "GPL-2.0-or-later"
4HOMEPAGE = "https://gitlab.com/wsakernel/picocom" 4HOMEPAGE = "https://gitlab.com/wsakernel/picocom"
5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" 5LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a"
6 6
7BASEPV = "2023-04" 7SRCREV = "7b6acbd421a2d4ca99376b7b427828dc1bcba4d8"
8PV = "${BASEPV}+git"
9
10SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342"
11 8
12SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ 9SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \
13 " 10 "
14 11
15S = "${WORKDIR}/git"
16 12
17EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ 13EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${PV}' \
18 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " 14 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' "
19 15
20do_install () { 16do_install () {
diff --git a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
index ad6a7501c5..c547b0532e 100644
--- a/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
+++ b/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
@@ -10,7 +10,9 @@ inherit pkgconfig
10SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" 10SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https"
11SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" 11SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f"
12 12
13S = "${WORKDIR}/git" 13# Upstream repo does not tag
14UPSTREAM_CHECK_COMMITS = "1"
15
14 16
15do_compile() { 17do_compile() {
16 oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}"; 18 oe_runmake CC="${CC}" CXX="${CXX}" EXTRA_INCLUDES="${TARGET_CFLAGS}" AR="${AR}";
diff --git a/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-oe/recipes-support/pidgin/icyque_git.bb
index ed58c4a76f..e8b4a3c2c3 100644
--- a/meta-oe/recipes-support/pidgin/icyque_git.bb
+++ b/meta-oe/recipes-support/pidgin/icyque_git.bb
@@ -12,7 +12,9 @@ inherit pkgconfig
12SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" 12SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https"
13SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" 13SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5"
14 14
15S = "${WORKDIR}/git" 15# Upstream repo does not tag
16UPSTREAM_CHECK_COMMITS = "1"
17
16 18
17do_compile() { 19do_compile() {
18 oe_runmake; 20 oe_runmake;
diff --git a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
index d17a623063..f2fe4a7a93 100644
--- a/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
+++ b/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb
@@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/pidgin/${BPN}/${PV}/${BP}.tar.xz \
15" 15"
16SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" 16SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8"
17 17
18UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/"
19UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)"
20
18EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" 21EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false"
19 22
20FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" 23FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so"
diff --git a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
index 115a6968eb..b4f462de83 100644
--- a/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
+++ b/meta-oe/recipes-support/pidgin/libotr_4.1.1.bb
@@ -10,7 +10,6 @@ SRC_URI = "http://www.cypherpunks.ca/otr/${BP}.tar.gz \
10 file://0001-tests-Include-missing-sys-socket.h-header.patch \ 10 file://0001-tests-Include-missing-sys-socket.h-header.patch \
11" 11"
12 12
13SRC_URI[md5sum] = "dac5a8778a35f674c046ddf5d97e4d81"
14SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5" 13SRC_URI[sha256sum] = "8b3b182424251067a952fb4e6c7b95a21e644fbb27fbd5f8af2b2ed87ca419f5"
15 14
16inherit autotools pkgconfig 15inherit autotools pkgconfig
diff --git a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
index 326c5bfc57..f4c9020dea 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-otr_4.0.2.bb
@@ -7,7 +7,6 @@ REQUIRED_DISTRO_FEATURES = "x11"
7 7
8SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \ 8SRC_URI = "https://otr.cypherpunks.ca/${BP}.tar.gz \
9" 9"
10SRC_URI[md5sum] = "7ef14e1334a4bc80e5d530f9a3cfc626"
11SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4" 10SRC_URI[sha256sum] = "f4b59eef4a94b1d29dbe0c106dd00cdc630e47f18619fc754e5afbf5724ebac4"
12 11
13FILES:${PN} = "${libdir}/pidgin/*" 12FILES:${PN} = "${libdir}/pidgin/*"
diff --git a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
index 6ce42ec187..5fd927bc64 100644
--- a/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb
@@ -14,7 +14,6 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sipe/pidgin-sipe-${PV}.tar.xz \
14 file://0001-Migrate-to-use-g_memdup2.patch \ 14 file://0001-Migrate-to-use-g_memdup2.patch \
15" 15"
16 16
17SRC_URI[md5sum] = "0e742f021dc8c3f17435aea05c3e0314"
18SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba" 17SRC_URI[sha256sum] = "738b121b11f2b3f1744150c00cb381222eb6cf67161a7742797eb4f03e64a2ba"
19 18
20PACKAGECONFIG ??= "nss krb5" 19PACKAGECONFIG ??= "nss krb5"
@@ -37,3 +36,7 @@ FILES:${PN} += " \
37 ${datadir}/appdata \ 36 ${datadir}/appdata \
38 ${datadir}/metainfo \ 37 ${datadir}/metainfo \
39" 38"
39
40# http://errors.yoctoproject.org/Errors/Details/766947/
41# pidgin-sipe-1.25.0/src/core/sipe-xml.c:210:9: error: initialization of 'void (*)(void *, const xmlError *)' {aka 'void (*)(void *, const struct _xmlError *)'} from incompatible pointer type 'void (*)(void *, xmlError *)' {aka 'void (*)(void *, struct _xmlError *)'} [-Wincompatible-pointer-types]
42CFLAGS += "-Wno-error=incompatible-pointer-types"
diff --git a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
deleted file mode 100644
index 1c4daa9f67..0000000000
--- a/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch
+++ /dev/null
@@ -1,26 +0,0 @@
1From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001
2From: Herrie <github.com@herrie.org>
3Date: Mon, 24 Jul 2017 21:30:16 +0200
4
5---
6Upstream-Status: Pending
7
8 libpurple/protocols/irc/irc.h | 4 ++--
9 1 file changed, 2 insertions(+), 2 deletions(-)
10
11diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h
12index 596ddaf..b70f3a9 100644
13--- a/libpurple/protocols/irc/irc.h
14+++ b/libpurple/protocols/irc/irc.h
15@@ -40,9 +40,9 @@
16
17 #define IRC_DEFAULT_CHARSET "UTF-8"
18 #define IRC_DEFAULT_AUTODETECT FALSE
19-#define IRC_DEFAULT_ALIAS "purple"
20+#define IRC_DEFAULT_ALIAS "OE-user"
21
22-#define IRC_DEFAULT_QUIT "Leaving."
23+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org"
24
25 #define IRC_BUFSIZE_INCREMENT 1024
26 #define IRC_MAX_BUFSIZE 16384
diff --git a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
index ae251b5a08..13a22f6e59 100644
--- a/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb
+++ b/meta-oe/recipes-support/pidgin/pidgin_2.14.14.bb
@@ -10,10 +10,9 @@ inherit autotools gettext pkgconfig gconf perlnative python3native
10SRC_URI = "\ 10SRC_URI = "\
11 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ 11 ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \
12 file://sanitize-configure.ac.patch \ 12 file://sanitize-configure.ac.patch \
13 file://purple-OE-branding-25.patch \
14" 13"
15 14
16SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" 15SRC_URI[sha256sum] = "0ffc9994def10260f98a55cd132deefa8dc4a9835451cc0e982747bd458e2356"
17 16
18CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 17CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
19CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." 18CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions."
@@ -21,7 +20,6 @@ CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't
21PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ 20PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \
22 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ 21 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \
23" 22"
24PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
25# --disable-gstreamer compile without GStreamer audio support 23# --disable-gstreamer compile without GStreamer audio support
26# --disable-gstreamer-video 24# --disable-gstreamer-video
27# compile without GStreamer 1.0 Video Overlay support 25# compile without GStreamer 1.0 Video Overlay support
@@ -29,8 +27,7 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2"
29# compile without GStreamer 0.10 interface support 27# compile without GStreamer 0.10 interface support
30# --with-gstreamer=<version> 28# --with-gstreamer=<version>
31# compile with GStreamer 0.10 or 1.0 interface 29# compile with GStreamer 0.10 or 1.0 interface
32PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" 30PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0"
33PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer"
34PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" 31PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn"
35PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" 32PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+"
36PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" 33PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11"
@@ -51,10 +48,19 @@ EXTRA_OECONF = " \
51 --disable-meanwhile \ 48 --disable-meanwhile \
52 --disable-nm \ 49 --disable-nm \
53 --disable-screensaver \ 50 --disable-screensaver \
51 --disable-farstream \
52 --disable-vv \
54" 53"
55 54
56OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" 55# CONFIG_ARGS is used to display build info. Replace full paths by reproducible
57OE_LT_RPATH_ALLOW[export]="1" 56# variables ($S, $WORKDIR)
57do_configure:append() {
58 sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h
59 sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h
60}
61
62OE_LT_RPATH_ALLOW = ":${libdir}/purple-2:"
63OE_LT_RPATH_ALLOW[export] = "1"
58 64
59PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data" 65PACKAGES =+ "libpurple-dev libpurple finch finch-dev ${PN}-data"
60 66
@@ -73,7 +79,7 @@ FILES:finch = "${bindir}/finch"
73FILES:finch-dev = "${libdir}/finch/*.la" 79FILES:finch-dev = "${libdir}/finch/*.la"
74 80
75FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ 81FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \
76 ${datadir}/applications" 82 ${datadir}/applications ${datadir}/metainfo"
77RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" 83RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp"
78 84
79FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" 85FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata"
diff --git a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
index 1981f1ee9c..421b1725ba 100644
--- a/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
+++ b/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
@@ -10,7 +10,6 @@ inherit pkgconfig
10SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https" 10SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https"
11SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6" 11SRCREV = "b226d1c457d73900ae89b8a7469247fbe33677a6"
12 12
13S = "${WORKDIR}/git"
14PV = "1.7+git" 13PV = "1.7+git"
15 14
16do_compile() { 15do_compile() {
diff --git a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb
index 816ee967c1..a403289cfc 100644
--- a/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb
+++ b/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_1.0.bb
@@ -11,17 +11,18 @@ SECTION = "libs"
11LICENSE = "Apache-2.0" 11LICENSE = "Apache-2.0"
12LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" 12LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45"
13DEPENDS = "\ 13DEPENDS = "\
14 autoconf-archive \
15 openssl \ 14 openssl \
16 p11-kit \ 15 p11-kit \
17" 16"
18 17
19SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" 18SRCREV = "8f6b94409d4872265076df310492da1e5f6abdf7"
20 19
21SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" 20SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https"
22 21
23S = "${WORKDIR}/git"
24 22
25inherit autotools pkgconfig 23inherit meson pkgconfig
24
25# Overwrite default pkcs11 module path
26#EXTRA_OEMESON += "-Ddefault_pkcs11_module=/path/to/mymodule.so"
26 27
27FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" 28FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so"
diff --git a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
index 19da947d04..3bd2f414d7 100644
--- a/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
+++ b/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb
@@ -10,9 +10,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g
10 file://0001-make-Respect-variables-from-environement.patch \ 10 file://0001-make-Respect-variables-from-environement.patch \
11 " 11 "
12 12
13SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee"
14SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" 13SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f"
15 14
15UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/"
16UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)"
17
16CFLAGS += "-DUSE_ZLIB" 18CFLAGS += "-DUSE_ZLIB"
17 19
18EXTRA_OEMAKE = "-f ${S}/Makefile.unx" 20EXTRA_OEMAKE = "-f ${S}/Makefile.unx"
diff --git a/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
new file mode 100644
index 0000000000..d976a1f83b
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch
@@ -0,0 +1,59 @@
1From 03c35cff930e421199b586c33a00eb6cc537ba28 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Thu, 19 Sep 2024 09:36:48 +0100
4Subject: [PATCH] SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied
5 `noexcept`)
6
7On today's `gcc-15` poco fails to build as:
8
9 In file included from /build/source/Data/include/Poco/Data/Statement.h:27,
10 from /build/source/Data/include/Poco/Data/Session.h:23,
11 from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:22,
12 from /build/source/Data/src/ArchiveStrategy.cpp:15:
13 /build/source/Data/include/Poco/Data/SimpleRowFormatter.h:114:21: error: declaration of 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_construc
14 tible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]' has a different exception specifier
15 114 | inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
16 | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
17 In file included from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/new_allocator.h:36,
18 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33,
19 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/allocator.h:46,
20 from /nix/store/...-gcc-15.0.0/include/c++/15.0.0/string:43,
21 from /build/source/Foundation/include/Poco/Foundation.h:94,
22 from /build/source/Data/include/Poco/Data/Data.h:23,
23 from /build/source/Data/include/Poco/Data/ArchiveStrategy.h:21:
24 /nix/store/...-gcc-15.0.0/include/c++/15.0.0/bits/move.h:214:5: note: from previous declaration 'std::_Require<std::__not_<std::__is_tuple_like<_Tp> >, std::is_move_constructible<_Tp>, std::is_move_assignable<_Tp> > std::swap(_Tp&, _Tp&) noexcept (false) [with _Tp = Poco::Data::SimpleRowFormatter; _Require<__not_<__is_tuple_like<_Tp> >, is_move_constructible<_Tp>, is_move_assignable<_Tp> > = void]'
25 214 | swap(_Tp& __a, _Tp& __b)
26 | ^~~~
27
28Possibly because `SimpleRowFormatter` does not have constructors and
29assignment operators that involve rvalue references?
30
31Updated `noexcept` condition. Fixes the build on` gcc-15`. Still
32compiles on `gcc-13`.
33
34Upstream-Status: Backport [03c35cf SimpleRowFormatter.h: fix the build on `gcc-15` (unsatisfied `noexcept`)]
35Signed-off-by: mark.yang <mark.yang@lge.com>
36---
37 Data/include/Poco/Data/SimpleRowFormatter.h | 5 +----
38 1 file changed, 1 insertion(+), 4 deletions(-)
39
40diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h
41index 0dcb43b0b..c8417b3a7 100644
42--- a/Data/include/Poco/Data/SimpleRowFormatter.h
43+++ b/Data/include/Poco/Data/SimpleRowFormatter.h
44@@ -109,13 +109,10 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const
45
46 namespace std
47 {
48- // Note: for an unknown reason, clang refuses to compile this function as noexcept
49 template<>
50 inline void swap<Poco::Data::SimpleRowFormatter>(Poco::Data::SimpleRowFormatter& s1,
51 Poco::Data::SimpleRowFormatter& s2)
52-#ifndef POCO_COMPILER_CLANG
53- noexcept
54-#endif
55+ noexcept(std::is_nothrow_swappable_v<Poco::Data::SimpleRowFormatter>)
56 /// Full template specalization of std:::swap for SimpleRowFormatter
57 {
58 s1.swap(s2);
59
diff --git a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
deleted file mode 100644
index b06135222a..0000000000
--- a/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch
+++ /dev/null
@@ -1,60 +0,0 @@
1From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 26 Jan 2023 14:56:36 -0800
4Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool>
5
6GCC on RISCV does not yet support inline subword atomics [1]
7Therefore avoid them until fixed
8
9Upstream-Status: Pending
10
11[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338
12
13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14---
15 Foundation/include/Poco/AsyncChannel.h | 2 +-
16 Foundation/src/AsyncChannel.cpp | 5 ++---
17 2 files changed, 3 insertions(+), 4 deletions(-)
18
19diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h
20index 190bae7dd..d73ea6c72 100644
21--- a/Foundation/include/Poco/AsyncChannel.h
22+++ b/Foundation/include/Poco/AsyncChannel.h
23@@ -111,7 +111,7 @@ private:
24 NotificationQueue _queue;
25 std::size_t _queueSize = 0;
26 std::size_t _dropCount = 0;
27- std::atomic<bool> _closed;
28+ std::atomic<int> _closed;
29 };
30
31
32diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp
33index 37cdec477..e829b180c 100644
34--- a/Foundation/src/AsyncChannel.cpp
35+++ b/Foundation/src/AsyncChannel.cpp
36@@ -48,11 +48,10 @@ private:
37 Message _msg;
38 };
39
40-
41 AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio):
42 _pChannel(pChannel),
43 _thread("AsyncChannel"),
44- _closed(false)
45+ _closed(0)
46 {
47 _thread.setPriority(prio);
48 }
49@@ -95,7 +94,7 @@ void AsyncChannel::open()
50
51 void AsyncChannel::close()
52 {
53- if (!_closed.exchange(true))
54+ if (!_closed.exchange(1))
55 {
56 if (_thread.isRunning())
57 {
58--
592.39.1
60
diff --git a/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
new file mode 100644
index 0000000000..e607063d58
--- /dev/null
+++ b/meta-oe/recipes-support/poco/poco/0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch
@@ -0,0 +1,53 @@
1From 6faf90773a7327e54342a5d3caee151623b5caf0 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= <guenter.obiltschnig@appinf.com>
3Date: Fri, 27 Sep 2024 08:53:18 +0200
4Subject: [PATCH] =?UTF-8?q?fix(Foundation):=20Build=20error=20with=20GCC-1?=
5 =?UTF-8?q?5=20(class=20Poco::PriorityDelegate<TObj,=20void,=20true>?=
6 =?UTF-8?q?=E2=80=99=20has=20no=20member=20named=20=E2=80=98=5FpTarget?=
7 =?UTF-8?q?=E2=80=99)=20(#4695)?=
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Upstream-Status: Backport [6faf907 fix(Foundation): Build error with GCC-15 (class Poco::PriorityDelegate<TObj, void, true>’ has no member named ‘_pTarget’) (#4695)]
13Signed-off-by: mark.yang <mark.yang@lge.com>
14---
15 Foundation/include/Poco/PriorityDelegate.h | 4 ----
16 1 file changed, 4 deletions(-)
17
18diff --git a/Foundation/include/Poco/PriorityDelegate.h b/Foundation/include/Poco/PriorityDelegate.h
19index 4cd664aab..cac9cf25e 100644
20--- a/Foundation/include/Poco/PriorityDelegate.h
21+++ b/Foundation/include/Poco/PriorityDelegate.h
22@@ -52,7 +52,6 @@ public:
23 {
24 if (&delegate != this)
25 {
26- this->_pTarget = delegate._pTarget;
27 this->_receiverObject = delegate._receiverObject;
28 this->_receiverMethod = delegate._receiverMethod;
29 this->_priority = delegate._priority;
30@@ -126,7 +125,6 @@ public:
31 {
32 if (&delegate != this)
33 {
34- this->_pTarget = delegate._pTarget;
35 this->_receiverObject = delegate._receiverObject;
36 this->_receiverMethod = delegate._receiverMethod;
37 this->_priority = delegate._priority;
38@@ -200,7 +198,6 @@ public:
39 {
40 if (&delegate != this)
41 {
42- this->_pTarget = delegate._pTarget;
43 this->_receiverObject = delegate._receiverObject;
44 this->_receiverMethod = delegate._receiverMethod;
45 this->_priority = delegate._priority;
46@@ -274,7 +271,6 @@ public:
47 {
48 if (&delegate != this)
49 {
50- this->_pTarget = delegate._pTarget;
51 this->_receiverObject = delegate._receiverObject;
52 this->_receiverMethod = delegate._receiverMethod;
53 this->_priority = delegate._priority;
diff --git a/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-oe/recipes-support/poco/poco_1.13.3.bb
index 6ad577b37b..e0f6c4169e 100644
--- a/meta-oe/recipes-support/poco/poco_1.13.3.bb
+++ b/meta-oe/recipes-support/poco/poco_1.13.3.bb
@@ -8,16 +8,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc"
8# These dependencies are required by Foundation 8# These dependencies are required by Foundation
9DEPENDS = "libpcre2 zlib" 9DEPENDS = "libpcre2 zlib"
10 10
11SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ 11SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \
12 file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \
13 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ 12 file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \
14 file://run-ptest \ 13 file://run-ptest \
14 file://0001-SimpleRowFormatter.h-fix-the-build-on-gcc-15-unsatis.patch \
15 file://0002-fix-Foundation-Build-error-with-GCC-15-class-Poco-Pr.patch \
15 " 16 "
16SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" 17SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4"
17 18
18UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" 19UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)"
19 20
20S = "${WORKDIR}/git"
21 21
22inherit cmake ptest 22inherit cmake ptest
23 23
diff --git a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
index adbe82263f..ab2fbf7d9b 100644
--- a/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
+++ b/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch
@@ -40,11 +40,9 @@ Upstream-Status: Pending
40 utils/CMakeLists.txt | 10 +++++----- 40 utils/CMakeLists.txt | 10 +++++-----
41 6 files changed, 16 insertions(+), 16 deletions(-) 41 6 files changed, 16 insertions(+), 16 deletions(-)
42 42
43diff --git a/CMakeLists.txt b/CMakeLists.txt
44index c6c757c..5f1c540 100644
45--- a/CMakeLists.txt 43--- a/CMakeLists.txt
46+++ b/CMakeLists.txt 44+++ b/CMakeLists.txt
47@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) 45@@ -628,10 +628,10 @@ add_library(poppler ${poppler_SRCS} ${LI
48 if (OpenJPEG_FOUND) 46 if (OpenJPEG_FOUND)
49 # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed 47 # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed
50 # target openjp2 may lack interface include directories 48 # target openjp2 may lack interface include directories
@@ -56,9 +54,7 @@ index c6c757c..5f1c540 100644
56+ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) 54+ target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR})
57 endif() 55 endif()
58 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") 56 generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h")
59 set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127) 57 set_target_properties(poppler PROPERTIES
60diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt
61index 52e8687..08ab39a 100644
62--- a/glib/CMakeLists.txt 58--- a/glib/CMakeLists.txt
63+++ b/glib/CMakeLists.txt 59+++ b/glib/CMakeLists.txt
64@@ -4,7 +4,7 @@ include_directories( 60@@ -4,7 +4,7 @@ include_directories(
@@ -66,7 +62,7 @@ index 52e8687..08ab39a 100644
66 62
67 include_directories( 63 include_directories(
68- SYSTEM 64- SYSTEM
69+ 65+
70 ${GLIB2_INCLUDE_DIRS} 66 ${GLIB2_INCLUDE_DIRS}
71 ${CAIRO_INCLUDE_DIRS} 67 ${CAIRO_INCLUDE_DIRS}
72 ) 68 )
@@ -78,9 +74,7 @@ index 52e8687..08ab39a 100644
78+target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) 74+target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS})
79 install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) 75 install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
80 76
81 install(FILES 77 if (ENABLE_NSS3)
82diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt
83index 5db3a6c..f242d29 100644
84--- a/qt5/src/CMakeLists.txt 78--- a/qt5/src/CMakeLists.txt
85+++ b/qt5/src/CMakeLists.txt 79+++ b/qt5/src/CMakeLists.txt
86@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) 80@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS)
@@ -97,8 +91,6 @@ index 5db3a6c..f242d29 100644
97 endif() 91 endif()
98 install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) 92 install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
99 93
100diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt
101index cd91975..6c42e12 100644
102--- a/qt6/src/CMakeLists.txt 94--- a/qt6/src/CMakeLists.txt
103+++ b/qt6/src/CMakeLists.txt 95+++ b/qt6/src/CMakeLists.txt
104@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) 96@@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS)
@@ -115,8 +107,6 @@ index cd91975..6c42e12 100644
115 endif() 107 endif()
116 install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) 108 install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
117 109
118diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
119index afa1352..9bd3b9a 100644
120--- a/test/CMakeLists.txt 110--- a/test/CMakeLists.txt
121+++ b/test/CMakeLists.txt 111+++ b/test/CMakeLists.txt
122@@ -23,7 +23,7 @@ if (GTK_FOUND) 112@@ -23,7 +23,7 @@ if (GTK_FOUND)
@@ -146,11 +136,9 @@ index afa1352..9bd3b9a 100644
146 endif () 136 endif ()
147 endif () 137 endif ()
148 138
149diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
150index 1c3ebcb..bc1840a 100644
151--- a/utils/CMakeLists.txt 139--- a/utils/CMakeLists.txt
152+++ b/utils/CMakeLists.txt 140+++ b/utils/CMakeLists.txt
153@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) 141@@ -18,7 +18,7 @@ add_executable(pdftoppm ${pdftoppm_SOURC
154 target_link_libraries(pdftoppm ${common_libs}) 142 target_link_libraries(pdftoppm ${common_libs})
155 if(LCMS2_FOUND) 143 if(LCMS2_FOUND)
156 target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) 144 target_link_libraries(pdftoppm ${LCMS2_LIBRARIES})
@@ -159,7 +147,7 @@ index 1c3ebcb..bc1840a 100644
159 endif() 147 endif()
160 install(TARGETS pdftoppm DESTINATION bin) 148 install(TARGETS pdftoppm DESTINATION bin)
161 install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 149 install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
162@@ -37,10 +37,10 @@ if (HAVE_CAIRO) 150@@ -39,10 +39,10 @@ if (HAVE_CAIRO)
163 add_definitions(${CAIRO_CFLAGS}) 151 add_definitions(${CAIRO_CFLAGS})
164 add_executable(pdftocairo ${pdftocairo_SOURCES}) 152 add_executable(pdftocairo ${pdftocairo_SOURCES})
165 target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) 153 target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs})
@@ -172,16 +160,16 @@ index 1c3ebcb..bc1840a 100644
172 endif() 160 endif()
173 install(TARGETS pdftocairo DESTINATION bin) 161 install(TARGETS pdftocairo DESTINATION bin)
174 install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 162 install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
175@@ -99,7 +99,7 @@ if (ENABLE_NSS3) 163@@ -109,7 +109,7 @@ if (ENABLE_SIGNATURES)
176 pdfsig.cc
177 )
178 add_executable(pdfsig ${pdfsig_SOURCES}) 164 add_executable(pdfsig ${pdfsig_SOURCES})
179- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
180+ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS})
181 target_link_libraries(pdfsig ${common_libs}) 165 target_link_libraries(pdfsig ${common_libs})
182 install(TARGETS pdfsig DESTINATION bin) 166 if (ENABLE_NSS3)
183 install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) 167- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS})
184@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) 168+ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS})
169 endif()
170 if (Intl_FOUND)
171 target_link_libraries(pdfsig Intl::Intl)
172@@ -127,7 +127,7 @@ add_executable(pdftops ${pdftops_SOURCES
185 target_link_libraries(pdftops ${common_libs}) 173 target_link_libraries(pdftops ${common_libs})
186 if(LCMS2_FOUND) 174 if(LCMS2_FOUND)
187 target_link_libraries(pdftops ${LCMS2_LIBRARIES}) 175 target_link_libraries(pdftops ${LCMS2_LIBRARIES})
diff --git a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch
deleted file mode 100644
index cc942fad77..0000000000
--- a/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch
+++ /dev/null
@@ -1,46 +0,0 @@
1From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001
2From: Albert Astals Cid <aacid@kde.org>
3Date: Fri, 18 Aug 2023 11:36:06 +0000
4Subject: [PATCH] OutlineItem::open: Fix crash on malformed files
5
6Fixes #1399
7
8CVE: CVE-2023-34872
9
10Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe]
11
12Signed-off-by: Yogita Urade <yogita.urade@windriver.com>
13---
14 poppler/Outline.cc | 10 +++++++---
15 1 file changed, 7 insertions(+), 3 deletions(-)
16
17diff --git a/poppler/Outline.cc b/poppler/Outline.cc
18index cbb6cb4..4c68be9 100644
19--- a/poppler/Outline.cc
20+++ b/poppler/Outline.cc
21@@ -14,7 +14,7 @@
22 // under GPL version 2 or later
23 //
24 // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com>
25-// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org>
26+// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org>
27 // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com>
28 // Copyright (C) 2016 Jason Crain <jason@aquaticape.us>
29 // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com>
30@@ -483,8 +483,12 @@ void OutlineItem::open()
31 {
32 if (!kids) {
33 Object itemDict = xref->fetch(ref);
34- const Object &firstRef = itemDict.dictLookupNF("First");
35- kids = readItemList(this, &firstRef, xref, doc);
36+ if (itemDict.isDict()) {
37+ const Object &firstRef = itemDict.dictLookupNF("First");
38+ kids = readItemList(this, &firstRef, xref, doc);
39+ } else {
40+ kids = new std::vector<OutlineItem *>();
41+ }
42 }
43 }
44
45--
462.35.5
diff --git a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch
deleted file mode 100644
index 70ba1cf123..0000000000
--- a/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001
2From: Jordan Abrahams-Whitehead <ajordanr@google.com>
3Date: Tue, 16 May 2023 18:52:19 +0000
4Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h
5
6Fixes #1398
7
8Upstream-Status: Backport
9Signed-off-by: Ross Burton <ross.burton@arm.com>
10---
11 goo/JpegWriter.cc | 2 +-
12 poppler/ImageEmbeddingUtils.cc | 1 +
13 2 files changed, 2 insertions(+), 1 deletion(-)
14
15diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc
16index ca69fd055..566ee38f8 100644
17--- a/goo/JpegWriter.cc
18+++ b/goo/JpegWriter.cc
19@@ -23,7 +23,7 @@
20 #ifdef ENABLE_LIBJPEG
21
22 # include "poppler/Error.h"
23-
24+# include <cstdio>
25 extern "C" {
26 # include <jpeglib.h>
27 }
28diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc
29index 0c13fe968..07b9dfb62 100644
30--- a/poppler/ImageEmbeddingUtils.cc
31+++ b/poppler/ImageEmbeddingUtils.cc
32@@ -14,6 +14,7 @@
33
34 #include <memory>
35 #ifdef ENABLE_LIBJPEG
36+# include <cstdio>
37 extern "C" {
38 # include <jpeglib.h>
39 }
40--
41GitLab
diff --git a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-oe/recipes-support/poppler/poppler_25.04.0.bb
index f4411e1163..1cd5f28cd8 100644
--- a/meta-oe/recipes-support/poppler/poppler_23.04.0.bb
+++ b/meta-oe/recipes-support/poppler/poppler_25.04.0.bb
@@ -7,24 +7,24 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \
7 file://0001-Do-not-overwrite-all-our-build-flags.patch \ 7 file://0001-Do-not-overwrite-all-our-build-flags.patch \
8 file://basename-include.patch \ 8 file://basename-include.patch \
9 file://0001-cmake-Do-not-use-isystem.patch \ 9 file://0001-cmake-Do-not-use-isystem.patch \
10 file://jpeg-stdio.patch \
11 file://CVE-2023-34872.patch \
12 " 10 "
13SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" 11SRC_URI[sha256sum] = "b010c596dce127fba88532fd2f1043e55ea30601767952d0f2c0a80e7dc0da3d"
14 12
15DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" 13DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native"
16 14
17inherit cmake pkgconfig gobject-introspection 15inherit cmake pkgconfig gobject-introspection
18 16
19PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" 17PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff"
18PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost"
20PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" 19PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg"
21PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" 20PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng"
22PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" 21PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff"
23PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" 22PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl"
24PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" 23PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg"
25PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" 24PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native"
26PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" 25PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss"
27PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" 26PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme"
27PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase"
28 28
29# surprise - did not expect this to work :) 29# surprise - did not expect this to work :)
30inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} 30inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
@@ -32,10 +32,9 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)}
32SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" 32SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}"
33 33
34EXTRA_OECMAKE += " \ 34EXTRA_OECMAKE += " \
35 -DENABLE_CMS=lcms2 \ 35 -DENABLE_LCMS=ON \
36 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ 36 -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \
37 -DBUILD_GTK_TESTS=OFF \ 37 -DBUILD_GTK_TESTS=OFF \
38 -DENABLE_ZLIB=ON \
39 -DRUN_GPERF_IF_PRESENT=OFF \ 38 -DRUN_GPERF_IF_PRESENT=OFF \
40 -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ 39 -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \
41 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ 40 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \
diff --git a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
index 2bf4d0a449..4451e96307 100644
--- a/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
+++ b/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb
@@ -8,7 +8,6 @@ PV .= "+git"
8SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https" 8SRC_URI = "git://github.com/PortAudio/portaudio.git;branch=master;protocol=https"
9SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97" 9SRCREV = "929e2e8f7af281c5eb4fa07758930d542ec43d97"
10 10
11S = "${WORKDIR}/git"
12 11
13inherit cmake pkgconfig 12inherit cmake pkgconfig
14 13
diff --git a/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch b/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch
new file mode 100644
index 0000000000..058217d68d
--- /dev/null
+++ b/meta-oe/recipes-support/pps-tools/pps-tools/0001-Use-lld-in-printf-for-64-bit-time_t.patch
@@ -0,0 +1,59 @@
1From 6faed0a3b41fba4619fe4598a2834dfb4d2be7e4 Mon Sep 17 00:00:00 2001
2From: Matt Merhar <mattmerhar@protonmail.com>
3Date: Fri, 10 Nov 2023 17:21:51 -0500
4Subject: [PATCH] Use %lld in printf for 64-bit time_t
5
6musl 1.2.0 switched to use 64-bit time_t everywhere, including 32-bit
7architectures, causing garbage values to be printed from ppswatch and
8ppstest.
9
10Use the correct format string for the affected printf statements and
11explicitly cast to long long to avoid potential compatibility issues
12with 32-bit glibc.
13
14Upstream-Status: Backport [https://github.com/redlab-i/pps-tools/commit/6faed0a3b41fba4619fe4598a2834dfb4d2be7e4]
15
16Signed-off-by: Matt Merhar <mattmerhar@protonmail.com>
17---
18 ppstest.c | 8 ++++----
19 ppswatch.c | 2 +-
20 2 files changed, 5 insertions(+), 5 deletions(-)
21
22diff --git a/ppstest.c b/ppstest.c
23index 0370794..c375a09 100644
24--- a/ppstest.c
25+++ b/ppstest.c
26@@ -110,13 +110,13 @@ retry:
27 }
28
29 printf("source %d - "
30- "assert %ld.%09ld, sequence: %ld - "
31- "clear %ld.%09ld, sequence: %ld\n",
32+ "assert %lld.%09ld, sequence: %ld - "
33+ "clear %lld.%09ld, sequence: %ld\n",
34 i,
35- infobuf.assert_timestamp.tv_sec,
36+ (long long)infobuf.assert_timestamp.tv_sec,
37 infobuf.assert_timestamp.tv_nsec,
38 infobuf.assert_sequence,
39- infobuf.clear_timestamp.tv_sec,
40+ (long long)infobuf.clear_timestamp.tv_sec,
41 infobuf.clear_timestamp.tv_nsec, infobuf.clear_sequence);
42 fflush(stdout);
43
44diff --git a/ppswatch.c b/ppswatch.c
45index 5c6202b..15d7a77 100644
46--- a/ppswatch.c
47+++ b/ppswatch.c
48@@ -148,7 +148,7 @@ int fetch_source(pps_handle_t handle, int avail_mode)
49 if (max_divergence < div)
50 max_divergence = div;
51 if (div >= margin) {
52- printf("timestamp: %ld, sequence: %ld, offset: % 6ld\n", ts.tv_sec, seq, ts.tv_nsec);
53+ printf("timestamp: %lld, sequence: %ld, offset: % 6ld\n", (long long)ts.tv_sec, seq, ts.tv_nsec);
54 fflush(stdout);
55 overflows++;
56 curr_unsync++;
57--
582.47.1
59
diff --git a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
index 65c06c1bd5..65caa05a13 100644
--- a/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
+++ b/meta-oe/recipes-support/pps-tools/pps-tools_1.0.3.bb
@@ -5,9 +5,10 @@ LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 5LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6 6
7SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29" 7SRCREV = "c50cb7183e252b47308fa22f420e0a877277aa29"
8SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https" 8SRC_URI = "git://github.com/ago/pps-tools.git;branch=master;protocol=https \
9 file://0001-Use-lld-in-printf-for-64-bit-time_t.patch \
10 "
9 11
10S = "${WORKDIR}/git"
11 12
12RDEPENDS:${PN} = "bash" 13RDEPENDS:${PN} = "bash"
13 14
diff --git a/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch b/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch
new file mode 100644
index 0000000000..9b98720b2e
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/0001-fix-too-many-arguments-issue.patch
@@ -0,0 +1,88 @@
1From 6f00795de8623347580c4366cb517a6653f73ca4 Mon Sep 17 00:00:00 2001
2From: Liu Yiding <liuyd.fnst@fujitsu.com>
3Date: Mon, 9 Jun 2025 08:01:39 +0000
4Subject: [PATCH] fix too many arguments issue
5
6fix issue like:
7| procmail.c:76:12: error: too many arguments to function 'auth_finduid'; expected 0, have 2
8| 76 | if(tpass=auth_finduid(uid,0)) /* save by copying */
9| | ^~~~~~~~~~~~ ~~~
10| In file included from procmail.c:36:
11| authenticate.h:15:3: note: declared here
12| 15 | *auth_finduid Q((const uid_t uid,const int sock));
13| --
14| procmail.c:212:9: error: too many arguments to function 'checkprivFrom_'; expected 0, have 3
15| 212 | checkprivFrom_(euid,passinvk?auth_username(passinvk):0,override);
16| | ^~~~~~~~~~~~~~ ~~~~
17| In file included from procmail.c:41:
18| from.h:9:2: note: declared here
19| 9 | checkprivFrom_ Q((uid_t euid,const char*logname,int override));
20| --
21| procmail.c:213:9: error: too many arguments to function 'doumask'; expected 0, have 1
22| 213 | doumask(INIT_UMASK); /* allowed to set the From_ line? */
23| | ^~~~~~~
24| In file included from procmail.c:23:
25| robust.h:12:2: note: declared here
26| 12 | doumask Q((const mode_t mask));
27
28Upstream-Status: Submitted [https://github.com/BuGlessRB/procmail/pull/11]
29Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
30---
31 src/authenticate.h | 2 +-
32 src/exopen.c | 2 +-
33 src/includes.h | 2 +-
34 src/misc.h | 1 +
35 4 files changed, 4 insertions(+), 3 deletions(-)
36
37diff --git a/src/authenticate.h b/src/authenticate.h
38index be9d88d..31e665a 100644
39--- a/src/authenticate.h
40+++ b/src/authenticate.h
41@@ -7,7 +7,7 @@ typedef struct auth_identity auth_identity;
42
43 #ifndef P
44 #define P(x) x
45-#define Q(x) ()
46+#define Q(x) x
47 #endif
48
49 /*const*/auth_identity
50diff --git a/src/exopen.c b/src/exopen.c
51index c7647e5..46e3467 100644
52--- a/src/exopen.c
53+++ b/src/exopen.c
54@@ -51,7 +51,7 @@ static const char*safehost P((void)) /* return a hostname safe for filenames */
55 return sname;
56 }
57
58-int unique(full,p,len,mode,verbos,flags)char*const full;char*p;
59+int unique(full,p,len,mode,verbos,flags)const char*const full;char*p;
60 const size_t len;const mode_t mode;const int verbos,flags;
61 { static const char s2c[]=".,+%";static int serial=STRLEN(s2c);
62 static time_t t;char*dot,*end,*host;struct stat filebuf;
63diff --git a/src/includes.h b/src/includes.h
64index 7d6b41f..134805b 100644
65--- a/src/includes.h
66+++ b/src/includes.h
67@@ -530,7 +530,7 @@ extern void*memmove();
68 * problems caused by one of those types being shorter than int and thereby
69 * being passed differently under ANSI rules.
70 */
71-#define Q(args) ()
72+#define Q(args) args
73
74 #ifdef oBRAIN_DAMAGE
75 #undef oBRAIN_DAMAGE
76diff --git a/src/misc.h b/src/misc.h
77index 4f62ebc..659dfcb 100644
78--- a/src/misc.h
79+++ b/src/misc.h
80@@ -1,4 +1,5 @@
81 /*$Id: misc.h,v 1.56 2001/06/30 01:14:19 guenther Exp $*/
82+#include "authenticate.h"
83
84 struct dyna_array{int filled,tspace;char*vals;};
85 union offori{off_t o;int i;};
86--
872.43.0
88
diff --git a/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch b/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch
new file mode 100644
index 0000000000..adbc4f584a
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/0001-fix-uname-declaration.patch
@@ -0,0 +1,27 @@
1From a9e57d4048c94f6bc2533ccc41e6c35d4416571a Mon Sep 17 00:00:00 2001
2From: Liu Yiding <liuyd.fnst@fujitsu.com>
3Date: Mon, 9 Jun 2025 06:44:06 +0000
4Subject: [PATCH] fix uname declaration
5
6Upstream-Status: Submitted [https://github.com/BuGlessRB/procmail/pull/11]
7Signed-off-by: Liu Yiding <liuyd.fnst@fujitsu.com>
8---
9 src/includes.h | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/src/includes.h b/src/includes.h
13index 4466907..7d6b41f 100644
14--- a/src/includes.h
15+++ b/src/includes.h
16@@ -331,7 +331,7 @@ extern int errno;
17
18 #ifndef NOuname
19 #ifndef P /* SINIX V5.23 has the wrong prototype for uname() */
20-extern int uname(); /* so we fix it :-) */
21+extern int uname(struct utsname *);
22 #define Uname(name) ((int(*)(struct utsname*))uname)(name)
23 #else
24 #define Uname(name) uname(name) /* no fix needed */
25--
262.43.0
27
diff --git a/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch b/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch
new file mode 100644
index 0000000000..b041924361
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/CVE-2014-3618.patch
@@ -0,0 +1,29 @@
1Description: Fix heap-overflow in formail
2 CVE-2014-3618: Heap-overflow in formail when processing
3 specially-crafted email headers.
4Origin: http://www.openwall.com/lists/oss-security/2014/09/03/8
5Bug-Debian: https://bugs.debian.org/704675
6Bug-Debian: https://bugs.debian.org/760443
7Forwarded: not-needed
8Last-Update: 2014-09-04
9
10CVE: CVE-2014-3618
11Upstream-Status: Inactive-Upstream [lastrelease: 2001]
12Signed-off-by: Peter Marko <peter.marko@siemens.com>
13
14--- a/src/formisc.c
15+++ b/src/formisc.c
16@@ -84,12 +84,11 @@ normal: *target++= *start++;
17 case '"':*target++=delim='"';start++;
18 }
19 ;{ int i;
20- do
21+ while(*start)
22 if((i= *target++= *start++)==delim) /* corresponding delimiter? */
23 break;
24 else if(i=='\\'&&*start) /* skip quoted character */
25 *target++= *start++;
26- while(*start); /* anything? */
27 }
28 hitspc=2;
29 }
diff --git a/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch b/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch
new file mode 100644
index 0000000000..6e04989c33
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/CVE-2017-16844.patch
@@ -0,0 +1,20 @@
1From: Santiago Vila <sanvila@debian.org>
2Subject: Fix heap-based buffer overflow in loadbuf()
3Bug-Debian: http://bugs.debian.org/876511
4X-Debian-version: 3.22-26
5
6CVE: CVE-2017-16844
7Upstream-Status: Inactive-Upstream [lastrelease: 2001]
8Signed-off-by: Peter Marko <peter.marko@siemens.com>
9
10--- a/src/formisc.c
11+++ b/src/formisc.c
12@@ -103,7 +103,7 @@
13 }
14 /* append to buf */
15 void loadbuf(text,len)const char*const text;const size_t len;
16-{ if(buffilled+len>buflen) /* buf can't hold the text */
17+{ while(buffilled+len>buflen) /* buf can't hold the text */
18 buf=realloc(buf,buflen+=Bsize);
19 tmemmove(buf+buffilled,text,len);buffilled+=len;
20 }
diff --git a/meta-oe/recipes-support/procmail/procmail/gcc14.patch b/meta-oe/recipes-support/procmail/procmail/gcc14.patch
new file mode 100644
index 0000000000..5ca56fa006
--- /dev/null
+++ b/meta-oe/recipes-support/procmail/procmail/gcc14.patch
@@ -0,0 +1,127 @@
1From: Santiago Vila <sanvila@debian.org>
2Subject: Fix build with gcc-14
3Bug-Debian: https://bugs.debian.org/1075398
4
5Upstream-Status: Pending
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7--- a/initmake
8+++ b/initmake
9@@ -124,7 +124,7 @@ else
10 fi
11
12 cat >_autotst.c <<HERE
13-main()
14+int main()
15 { return 0;
16 }
17 HERE
18@@ -200,7 +200,7 @@ cat >_autotst.c <<HERE
19 #include <sys/types.h>
20 #include <stdio.h>
21 #include <sys/stat.h>
22-main()
23+int main()
24 { struct stat buf;return!&buf;
25 }
26 HERE
27--- a/src/autoconf
28+++ b/src/autoconf
29@@ -414,6 +414,12 @@ cat >_autotst.c <<HERE
30 int dolock,child[NR_of_forks],timeout,fdcollect;
31 char dirlocktest[]="_locktest";
32
33+#include <stdlib.h>
34+int killchildren();
35+int fdlock(int fd);
36+int sfdlock(int fd);
37+int fdunlock();
38+
39 void stimeout()
40 { timeout=1;close(fdcollect);killchildren();
41 }
42@@ -435,7 +441,7 @@ unsigned sfork()
43 return pid;
44 }
45
46-int main(argc,argv)char*argv[];
47+int main(int argc,char*argv[])
48 { int goodlock,testlock,i,pip[2],pipw[2];time_t otimet;unsigned dtimet;
49 static char filename[]="_locktst.l0";
50 close(0);goodlock=0;testlock=FIRST_lock;signal(SIGPIPE,SIG_DFL);
51@@ -585,13 +591,13 @@ int killchildren()
52 return 0;
53 }
54
55-int sfdlock(fd)
56+int sfdlock(int fd)
57 { int i;unsigned gobble[GOBBLE>>2];
58 for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
59 return fdlock(fd);
60 }
61
62-static oldfdlock;
63+static int oldfdlock;
64 #ifdef F_SETLKW
65 static struct flock flck; /* why can't it be a local variable? */
66 #endif
67@@ -599,7 +605,7 @@ static struct flock flck; /* why can't
68 static off_t oldlockoffset;
69 #endif
70
71-int fdlock(fd)
72+int fdlock(int fd)
73 { int i;unsigned gobble[GOBBLE>>2];
74 for(i=GOBBLE>>2;i;gobble[--i]=~(unsigned)0); /* SunOS crash test */
75 oldfdlock=fd;fd=0;
76@@ -993,11 +999,11 @@ int main(){int i;i=1;
77 i+=WIFEXITED(i);
78 i+=WIFSTOPPED(i);
79 i+=WEXITSTATUS(i);
80- i+=WSIGTERM(i);
81+ i+=WTERMSIG(i);
82 return i;}
83 HERE
84
85-echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WSIGTERM()'
86+echo 'Testing for WIFEXITED(), WIFSTOPPED(), WEXITSTATUS() & WTERMSIG()'
87 if $MAKE _autotst.$O >_autotst.rrr 2>&1
88 then
89 $FGREP -v include/ <_autotst.rrr >_autotst.$O
90@@ -1029,6 +1035,8 @@ cat >_autotst.c <<HERE
91 #ifndef NO_COMSAT
92 #include "network.h"
93 #endif
94+int setrgid();
95+int setresgid();
96 int main(){char a[2];
97 endpwent();endgrent();memmove(a,"0",1);bcopy("0",a,1);strcspn(a,"0");
98 strtol("0",(char**)0,10);strchr("0",'0');strpbrk(a,"0");rename(a,"0");
99@@ -1059,7 +1067,7 @@ echo 'Testing for memmove, strchr, strpb
100 echo ' rename, setrgid, setegid, pow, opendir, mkdir, waitpid, fsync,'
101 echo ' ftruncate, strtod, strncasecmp, strerror, strlcat,'
102 echo ' memset, bzero, and _exit'
103-if $MAKE _autotst.$O >$DEVNULL 2>&1
104+if $MAKE _autotst.$O >_autotst.rrr 2>&1
105 then
106 :
107 else
108@@ -1196,7 +1204,7 @@ unsigned long dobench(strstr,iter,haysta
109 return (unsigned long)clock()-to;
110 }
111 #endif
112-int main(argc,argv)int argc;const char*argv[];
113+int main(int argc,const char*argv[])
114 { if(argc==1)
115 { char*haystack;
116 #ifdef BENCHSIZE
117--- a/src/mailfold.c
118+++ b/src/mailfold.c
119@@ -378,7 +378,7 @@ void concon(ch)const int ch; /* flip b
120 }
121 }
122
123-void readmail(rhead,tobesent)const long tobesent;
124+void readmail(int rhead,const long tobesent)
125 { char*chp,*pastend;static size_t contlengthoffset;
126 ;{ long dfilled;
127 if(rhead==2) /* already read, just examine what we have */
diff --git a/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-oe/recipes-support/procmail/procmail_3.22.bb
index 16917666a4..47c8310eaf 100644
--- a/meta-oe/recipes-support/procmail/procmail_3.22.bb
+++ b/meta-oe/recipes-support/procmail/procmail_3.22.bb
@@ -12,8 +12,13 @@ SRC_URI = "http://www.ring.gr.jp/archives/net/mail/${BPN}/${BP}.tar.gz \
12 file://from-debian-to-fix-compile-errors.patch \ 12 file://from-debian-to-fix-compile-errors.patch \
13 file://from-debian-to-modify-parameters.patch \ 13 file://from-debian-to-modify-parameters.patch \
14 file://from-debian-to-fix-man-file.patch \ 14 file://from-debian-to-fix-man-file.patch \
15 file://man-file-mailstat.1-from-debian.patch" 15 file://man-file-mailstat.1-from-debian.patch \
16SRC_URI[md5sum] = "1678ea99b973eb77eda4ecf6acae53f1" 16 file://CVE-2014-3618.patch \
17 file://CVE-2017-16844.patch \
18 file://gcc14.patch \
19 file://0001-fix-uname-declaration.patch \
20 file://0001-fix-too-many-arguments-issue.patch \
21"
17SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117" 22SRC_URI[sha256sum] = "087c75b34dd33d8b9df5afe9e42801c9395f4bf373a784d9bc97153b0062e117"
18 23
19LICENSE = "GPL-2.0-only & Artistic-1.0" 24LICENSE = "GPL-2.0-only & Artistic-1.0"
@@ -22,6 +27,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a71e50e197a992c862379e576e669757 \
22 27
23DEPENDS = "libnet" 28DEPENDS = "libnet"
24inherit autotools-brokensep 29inherit autotools-brokensep
30
25do_configure() { 31do_configure() {
26 find examples -type f | xargs chmod 644 32 find examples -type f | xargs chmod 644
27 export CC="${BUILD_CC}" 33 export CC="${BUILD_CC}"
@@ -33,7 +39,7 @@ do_configure() {
33} 39}
34 40
35do_compile() { 41do_compile() {
36 oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" 42 oe_runmake -i CFLAGS="$TARGET_CFLAGS -Wno-comments -Wno-implicit-int -Wno-implicit-function-declaration -Wno-incompatible-pointer-types -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}"
37} 43}
38 44
39do_install() { 45do_install() {
diff --git a/meta-oe/recipes-support/psutils/psutils_2.10.bb b/meta-oe/recipes-support/psutils/psutils_2.10.bb
index 1f1894a5f2..14792acaa5 100644
--- a/meta-oe/recipes-support/psutils/psutils_2.10.bb
+++ b/meta-oe/recipes-support/psutils/psutils_2.10.bb
@@ -6,7 +6,7 @@ SRC_URI[sha256sum] = "6f8339fd5322df5c782bfb355d9f89e513353220fca0700a5a28775404
6 6
7inherit perlnative autotools 7inherit perlnative autotools
8 8
9export PERL="/usr/bin/env perl" 9export PERL = "/usr/bin/env perl"
10 10
11DEPENDS += "libpaper-native" 11DEPENDS += "libpaper-native"
12 12
diff --git a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch b/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
deleted file mode 100644
index c51fb1cfdb..0000000000
--- a/meta-oe/recipes-support/pv/pv/0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From c5cd932fb08e7ce90cdbf9ae6c5cc7e65ac0738e Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Michael=20Wei=C3=9F?= <michael.weiss@aisec.fraunhofer.de>
3Date: Tue, 9 May 2023 20:00:26 +0200
4Subject: [PATCH] pv/display: handle error of tcgetpgrp() in pv_in_foreground()
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9Show pv progress bar even if no terminal is set, e.g., in a busybox
10init script. The description of pv_in_forground() states it will
11return true "if we aren't outputting to a terminal". However, this
12is not the case since tcgetpgrg() will return an error and set ERRNO
13to ENOTTY if the output fd is not an tty. We now handle this error
14correctly and pv_in_foreground() returns also true in that case.
15
16Signed-off-by: Michael Weiß <michael.weiss@aisec.fraunhofer.de>
17---
18Upstream-Status: Pending
19
20 src/pv/display.c | 4 ++++
21 1 file changed, 4 insertions(+)
22
23diff --git a/src/pv/display.c b/src/pv/display.c
24index aff643b..8d1f4c9 100644
25--- a/src/pv/display.c
26+++ b/src/pv/display.c
27@@ -48,6 +48,10 @@ bool pv_in_foreground(void)
28
29 our_process_group = getpgrp();
30 tty_process_group = tcgetpgrp(STDERR_FILENO);
31+
32+ if (tty_process_group == -1 && errno == ENOTTY)
33+ return true;
34+
35 if (our_process_group == tty_process_group)
36 return true;
37
38--
392.30.2
40
diff --git a/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
new file mode 100644
index 0000000000..f5e2b05768
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv/pv-test-system-version.patch
@@ -0,0 +1,18 @@
1Use the version of pv installed on the system rather than the ./pv from
2the development tree as is done when running 'make check'.
3
4Upstream-Status: Inappropriate [x-compile specific]
5
6---
7diff -Naur pv-1.9.31.orig/tests/test-env.sh pv-1.9.31/tests/test-env.sh
8--- pv-1.9.31.orig/tests/test-env.sh 2024-12-07 08:59:43.000000000 -0500
9+++ pv-1.9.31/tests/test-env.sh 2025-03-26 14:11:30.987123378 -0400
10@@ -9,7 +9,7 @@
11 true "${srcdir:?not set - call this from 'make check'}"
12
13 # Parameters.
14-testSubject="./pv"
15+testSubject="pv"
16 sourcePath="${srcdir}"
17
18 # Set everything to the "C" locale.
diff --git a/meta-oe/recipes-support/pv/pv/run-ptest b/meta-oe/recipes-support/pv/pv/run-ptest
index 3f5956f4c0..b0370e0a99 100644
--- a/meta-oe/recipes-support/pv/pv/run-ptest
+++ b/meta-oe/recipes-support/pv/pv/run-ptest
@@ -1,7 +1,22 @@
1#!/bin/sh 1#!/bin/sh
2 2
3rm -rf tests.log 3srcdir=/usr/lib/pv/ptest
4sh -e run-test.sh pv . > tests.log 2>&1 4export srcdir
5sed -e 's|\(.*\):.*OK|PASS: \1|' \ 5
6 -e 's|\(.*\):.*FAILED|FAIL: \1|' \ 6source tests/test-env.sh
7 tests.log 7
8num_fail=0
9
10# all pv tests are capitalized
11for test in tests/[A-Z]*
12do
13 ./"$test" \
14 && echo "PASS: $test" \
15 || {
16 echo "FAIL: $test"
17 num_fail=$(( ${num_fail} + 1))
18 }
19
20done
21
22exit $num_fail
diff --git a/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-oe/recipes-support/pv/pv_1.6.20.bb
deleted file mode 100644
index 6a739af927..0000000000
--- a/meta-oe/recipes-support/pv/pv_1.6.20.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
2HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
3
4LICENSE = "Artistic-2.0"
5LIC_FILES_CHKSUM = "file://doc/COPYING;md5=9c50db2589ee3ef10a9b7b2e50ce1d02"
6
7SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \
8 file://0001-pv-display-handle-error-of-tcgetpgrp-in-pv_in_foregr.patch \
9 file://run-ptest \
10"
11SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603"
12
13UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
14UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2"
15
16inherit autotools ptest
17
18LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
19export LDEMULATION
20
21RDEPENDS:${PN}-ptest += "coreutils ${PN}"
22
23do_install_ptest() {
24 install -d ${D}${PTEST_PATH}/tests
25 cp -r ${S}/tests/* ${D}${PTEST_PATH}/tests
26 cp -r ${S}/autoconf/scripts/run-test.sh ${D}${PTEST_PATH}
27 # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
28}
diff --git a/meta-oe/recipes-support/pv/pv_1.9.31.bb b/meta-oe/recipes-support/pv/pv_1.9.31.bb
new file mode 100644
index 0000000000..578012fcfd
--- /dev/null
+++ b/meta-oe/recipes-support/pv/pv_1.9.31.bb
@@ -0,0 +1,65 @@
1SUMMARY = "Terminal-based tool for monitoring the progress of data through a pipeline"
2HOMEPAGE = "http://www.ivarch.com/programs/pv.shtml"
3
4LICENSE = "GPL-3.0-or-later"
5LIC_FILES_CHKSUM = "file://docs/COPYING;md5=1ebbd3e34237af26da5dc08a4e440464"
6
7SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.gz \
8 file://pv-test-system-version.patch \
9 file://run-ptest \
10"
11SRC_URI[sha256sum] = "a35e92ec4ac0e8f380e8e840088167ae01014bfa008a3a9d6506b848079daedf"
12
13UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml"
14UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar"
15
16inherit autotools gettext ptest
17
18LDEMULATION:mipsarchn32 = "${@bb.utils.contains('TUNE_FEATURES', 'bigendian', 'elf32btsmipn32', 'elf32ltsmipn32', d)}"
19export LDEMULATION
20
21# for ptests
22VALGRIND = "valgrind"
23
24# valgrind supports armv7 and above
25VALGRIND:armv4 = ''
26VALGRIND:armv5 = ''
27VALGRIND:armv6 = ''
28
29# X32 isn't supported by valgrind at this time
30VALGRIND:linux-gnux32 = ''
31VALGRIND:linux-muslx32 = ''
32
33# Disable for some MIPS variants
34VALGRIND:mipsarchr6 = ''
35VALGRIND:linux-gnun32 = ''
36
37# Disable for powerpc64 with musl
38VALGRIND:libc-musl:powerpc64 = ''
39VALGRIND:libc-musl:powerpc64le = ''
40
41# RISC-V support for valgrind is not there yet
42VALGRIND:riscv64 = ""
43VALGRIND:riscv32 = ""
44
45RDEPENDS:${PN}-ptest += "bash coreutils tmux ${VALGRIND}"
46RDEPENDS:${PN}-ptest:append:libc-musl = " musl-locales"
47RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-binary-localedata-c"
48
49do_install_ptest() {
50 testsdir=${D}${PTEST_PATH}/tests
51 install -d ${testsdir}
52 cp -r ${S}/tests/* ${testsdir}
53 #
54 # remove self-hosted install test
55 rm -f ${testsdir}/Bug_-_Install_all_files.test
56 # skip the failing valgrind tests for now (March 2025).
57 # See: https://bugzilla.yoctoproject.org/show_bug.cgi?id=15817
58 rm -f ${testsdir}/Memory*
59 # test requires at least 3GB free on /tmp
60 rm -f ${testsdir}/Integrity_-_Large_file_support.test
61 # fails due to our prompt:
62 rm -f ${testsdir}/Terminal_-_Detect_width.test
63 #
64 # sed -i -e 's@\$SRCDIR/@./@g' ${D}${PTEST_PATH}/run-ptest
65}
diff --git a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
index 09534c44fd..ff4668ecde 100644
--- a/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
+++ b/meta-oe/recipes-support/pxaregs/pxaregs_1.14.bb
@@ -9,8 +9,7 @@ SRC_URI = "file://pxaregs.c \
9 file://serial.patch \ 9 file://serial.patch \
10 file://usb.patch " 10 file://usb.patch "
11 11
12S = "${WORKDIR}/sources" 12S = "${UNPACKDIR}"
13UNPACKDIR = "${S}"
14 13
15do_compile() { 14do_compile() {
16 ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS} 15 ${CC} pxaregs.c -o pxaregs ${CFLAGS} ${LDFLAGS}
@@ -21,5 +20,4 @@ do_install() {
21 install -m 0755 pxaregs ${D}${sbindir}/ 20 install -m 0755 pxaregs ${D}${sbindir}/
22} 21}
23 22
24SRC_URI[md5sum] = "a43baa88842cd5926dbffb6fb87624f6"
25SRC_URI[sha256sum] = "f339b91cd8ab348052c36b36d20033e4bffc3666bc836ff72d5704f025e1c057" 23SRC_URI[sha256sum] = "f339b91cd8ab348052c36b36d20033e4bffc3666bc836ff72d5704f025e1c057"
diff --git a/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch
new file mode 100644
index 0000000000..b12beff6cb
--- /dev/null
+++ b/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch
@@ -0,0 +1,73 @@
1Do not use curl-config
2
3Sourced from
4https://bugs.gentoo.org/552474
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- a/configure.ac
9+++ b/configure.ac
10@@ -596,49 +596,12 @@ else
11 PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0])
12 fi
13
14-dnl curl
15-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="")
16-
17-if test "X$curl_config" != "Xno" ; then
18- if test "X$curl_config" != "X" ; then
19- AC_MSG_CHECKING(for $curl_config)
20-
21- if test -f $curl_config ; then
22- CURL_CONFIG=$curl_config
23- AC_MSG_RESULT(yes)
24- else
25- AC_MSG_RESULT(no - searching PATH)
26- fi
27- fi
28- if test "X$CURL_CONFIG" = "X" ; then
29- AC_CHECK_PROGS(CURL_CONFIG, curl-config)
30- fi
31-fi
32-
33 libcurl_source=no
34-if test "X$CURL_CONFIG" != "X"; then
35- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags`
36- LIBCURL_LIBS=`$CURL_CONFIG --libs`
37-
38- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS"
39- LIBS="$LIBS $LIBCURL_LIBS"
40- AC_CHECK_HEADER(curl/curl.h)
41- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no)
42-
43- AC_MSG_CHECKING(for libcurl via curl-config)
44- if test $have_curl_easy_init = yes; then
45- libcurl_source="curl-config"
46- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'`
47- fi
48- CPPFLAGS="$oCPPFLAGS"
49- LIBS="$oLIBS"
50-else
51- PKG_CHECK_MODULES([LIBCURL],[libcurl],[
52- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
53- libcurl_source="pkg-config"
54- ], [:])
55- AC_MSG_CHECKING(for libcurl via pkg-config)
56-fi
57+PKG_CHECK_MODULES([LIBCURL],[libcurl],[
58+ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion`
59+ libcurl_source="pkg-config"
60+], [:])
61+AC_MSG_CHECKING(for libcurl via pkg-config)
62
63 if test "$libcurl_source" = "no"; then
64 AC_MSG_RESULT(no - not found)
65@@ -1033,7 +996,7 @@ need_libcurl=0
66 need_libxml_www=0
67 need_libfetch=0
68
69-if test "X$CURL_CONFIG" != X; then
70+if test "$libcurl_source" != "no"; then
71 CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS"
72 LIBS="$LIBS $LIBCURL_LIBS"
73 AC_CHECK_HEADER(curl/curl.h)
diff --git a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
index 85012bcfb3..7014a28c02 100644
--- a/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
+++ b/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb
@@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \
7 file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ 7 file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
8" 8"
9 9
10DEPENDS = "libxml2 libxslt curl yajl" 10DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl"
11 11
12SRC_URI = " \ 12SRC_URI = " \
13 http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ 13 http://download.librdf.org/source/${BPN}-${PV}.tar.gz \
14 file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ 14 file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \
15 file://raptor-2.0.16-dont_use_curl-config.patch \
15" 16"
16SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" 17SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680"
17 18
18inherit autotools pkgconfig gtk-doc 19inherit autotools pkgconfig gtk-doc perlnative
19 20
20EXTRA_OECONF = " \ 21EXTRA_OECONF = " \
21 --without-xml2-config \ 22 --without-xml2-config \
22 --without-curl-config \
23 --without-xslt-config \ 23 --without-xslt-config \
24" 24"
diff --git a/meta-oe/recipes-support/re2/re2_2024.03.01.bb b/meta-oe/recipes-support/re2/re2_2024.03.01.bb
index 76d6f0c7a9..55a834fa42 100644
--- a/meta-oe/recipes-support/re2/re2_2024.03.01.bb
+++ b/meta-oe/recipes-support/re2/re2_2024.03.01.bb
@@ -10,7 +10,6 @@ SRC_URI = "git://github.com/google/re2.git;branch=main;protocol=https \
10 ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \ 10 ${@bb.utils.contains('PTEST_ENABLED', '1', 'file://run-ptest', '', d)} \
11 " 11 "
12 12
13S = "${WORKDIR}/git"
14 13
15DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}" 14DEPENDS = "abseil-cpp ${@bb.utils.contains('PTEST_ENABLED', '1', 'gtest googlebenchmark', '', d)}"
16 15
diff --git a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
index 28da51a21c..5ea0fb852a 100644
--- a/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
+++ b/meta-oe/recipes-support/read-edid/read-edid_3.0.2.bb
@@ -12,7 +12,6 @@ SRC_URI = "http://polypux.org/projects/read-edid/read-edid-${PV}.tar.gz \
12 file://0001-Do-not-install-license-file.patch \ 12 file://0001-Do-not-install-license-file.patch \
13 file://0001-get-edid-define-quiet-once.patch \ 13 file://0001-get-edid-define-quiet-once.patch \
14 " 14 "
15SRC_URI[md5sum] = "016546e438bf6c98739ff74061df9854"
16SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f" 15SRC_URI[sha256sum] = "c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f"
17 16
18EXTRA_OECMAKE = "-DCLASSICBUILD=OFF" 17EXTRA_OECMAKE = "-DCLASSICBUILD=OFF"
diff --git a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
index c038966ba8..4172de857c 100644
--- a/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
+++ b/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb
@@ -6,7 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
6SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master" 6SRC_URI = "git://gitlab.com/postmarketOS/reboot-mode.git;protocol=http;branch=master"
7SRCREV = "84831b20512abd9033414ca5f5a023f333525335" 7SRCREV = "84831b20512abd9033414ca5f5a023f333525335"
8 8
9S = "${WORKDIR}/git" 9
10# Upstream repo has not made releases/tags after 1.0.0
11UPSTREAM_CHECK_COMMITS = "1"
10 12
11do_compile() { 13do_compile() {
12 ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode 14 ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode
diff --git a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
index 0cad52df3a..aefd871354 100644
--- a/meta-oe/recipes-support/remmina/remmina_1.4.35.bb
+++ b/meta-oe/recipes-support/remmina/remmina_1.4.36.bb
@@ -25,9 +25,8 @@ DEPENDS = " \
25DEPENDS:append:libc-musl = " libexecinfo" 25DEPENDS:append:libc-musl = " libexecinfo"
26LDFLAGS:append:libc-musl = " -lexecinfo" 26LDFLAGS:append:libc-musl = " -lexecinfo"
27 27
28SRCREV = "2a455eadd6462457d08c2d066c5c245e0dee3bf9" 28SRCREV = "17cf7956b9f925fa788083a2db8d5e669f86bfaf"
29SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master" 29SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https;branch=master"
30S = "${WORKDIR}/git"
31 30
32inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig 31inherit cmake features_check mime mime-xdg gtk-icon-cache pkgconfig
33REQUIRED_DISTRO_FEATURES = "x11" 32REQUIRED_DISTRO_FEATURES = "x11"
@@ -44,7 +43,7 @@ do_configure:append() {
44 43
45RDEPENDS:${PN} = "bash" 44RDEPENDS:${PN} = "bash"
46 45
47FILES:${PN}+= " \ 46FILES:${PN} += " \
48 ${datadir}/metainfo \ 47 ${datadir}/metainfo \
49 ${datadir}/mime \ 48 ${datadir}/mime \
50" 49"
diff --git a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
index 57b31a78d9..5f4ffcd657 100644
--- a/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
+++ b/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb
@@ -9,7 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=25a0555028c71837623fa6dfa4cc45c0"
9SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master" 9SRC_URI = "git://github.com/nelhage/reptyr.git;protocol=https;branch=master"
10SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41" 10SRCREV = "1238097fc2cd15db058d2185cc4985daa87bcd41"
11 11
12S = "${WORKDIR}/git"
13 12
14inherit bash-completion github-releases manpages pkgconfig 13inherit bash-completion github-releases manpages pkgconfig
15 14
@@ -27,3 +26,5 @@ do_compile () {
27do_install () { 26do_install () {
28 oe_runmake install 'DESTDIR=${D}' 27 oe_runmake install 'DESTDIR=${D}'
29} 28}
29
30COMPATIBLE_HOST:riscv32 = "null"
diff --git a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
index 3cbd04bd5c..8c4183bae3 100644
--- a/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+++ b/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
@@ -29,7 +29,6 @@ SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \
29 file://configure-fix-cmd_rsync.patch \ 29 file://configure-fix-cmd_rsync.patch \
30 " 30 "
31 31
32S = "${WORKDIR}/git"
33 32
34inherit autotools perlnative 33inherit autotools perlnative
35 34
diff --git a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
index d65f5da859..711d4696fd 100644
--- a/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
+++ b/meta-oe/recipes-support/rtc-tools/rtc-tools_2022.02.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=74274e8a218423e49eefdea80bc55038"
5SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master" 5SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/${BPN}.git;protocol=https;branch=master"
6SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8" 6SRCREV = "61839777afedcc7bdb68ea4628c5ce5ca72c2ac8"
7 7
8S = "${WORKDIR}/git"
9 8
10EXTRA_OEMAKE = "DESTDIR=${D}" 9EXTRA_OEMAKE = "DESTDIR=${D}"
11 10
diff --git a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
index 4f06e55e8e..b68820dfd6 100644
--- a/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
+++ b/meta-oe/recipes-support/rtkit/rtkit_0.13.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a8e768468b658b3ed44971b53d4a6716"
5SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master" 5SRC_URI = "git://github.com/heftig/rtkit.git;protocol=https;branch=master"
6 6
7SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599" 7SRCREV = "b9169402fe5e82d20efb754509eb0b191f214599"
8S = "${WORKDIR}/git"
9 8
10inherit meson pkgconfig features_check useradd 9inherit meson pkgconfig features_check useradd
11 10
diff --git a/meta-oe/recipes-support/sass/libsass_git.bb b/meta-oe/recipes-support/sass/libsass_git.bb
deleted file mode 100644
index f0824944b9..0000000000
--- a/meta-oe/recipes-support/sass/libsass_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SUMMARY = "C/C++ port of the Sass CSS precompiler"
2HOMEPAGE = "http://sass-lang.com/libsass"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=8f34396ca205f5e119ee77aae91fa27d"
5
6inherit autotools
7
8SRC_URI = "git://github.com/sass/libsass.git;branch=master;protocol=https"
9SRCREV = "7037f03fabeb2b18b5efa84403f5a6d7a990f460"
10PV = "3.6.6"
11
12S = "${WORKDIR}/git"
13
14BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/sass/sassc_git.bb b/meta-oe/recipes-support/sass/sassc_git.bb
deleted file mode 100644
index 9bb8c76e87..0000000000
--- a/meta-oe/recipes-support/sass/sassc_git.bb
+++ /dev/null
@@ -1,14 +0,0 @@
1SUMMARY = "libsass command line driver "
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=2f8a76980411a3f1f1480b141ce06744"
4
5DEPENDS = "libsass"
6
7inherit autotools pkgconfig
8
9SRC_URI = "git://github.com/sass/sassc.git;branch=master;protocol=https"
10SRCREV = "66f0ef37e7f0ad3a65d2f481eff09d09408f42d0"
11S = "${WORKDIR}/git"
12PV = "3.6.2"
13
14BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/satyr/satyr_0.43.bb b/meta-oe/recipes-support/satyr/satyr_0.43.bb
index 9e6d701c7f..1976a929bd 100644
--- a/meta-oe/recipes-support/satyr/satyr_0.43.bb
+++ b/meta-oe/recipes-support/satyr/satyr_0.43.bb
@@ -11,7 +11,6 @@ SRC_URI = "git://github.com/abrt/satyr.git;branch=master;protocol=https \
11 file://0002-fix-compile-failure-against-musl-C-library.patch \ 11 file://0002-fix-compile-failure-against-musl-C-library.patch \
12 " 12 "
13SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5" 13SRCREV = "5891618d6a95afc4cde6757374485adf9bf0e9a5"
14S = "${WORKDIR}/git"
15 14
16LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" 15LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
17 16
diff --git a/meta-oe/recipes-support/sdmon/sdmon_git.bb b/meta-oe/recipes-support/sdmon/sdmon_git.bb
index 81c8033c15..8007ead6c6 100644
--- a/meta-oe/recipes-support/sdmon/sdmon_git.bb
+++ b/meta-oe/recipes-support/sdmon/sdmon_git.bb
@@ -9,7 +9,6 @@ SRC_URI = "git://github.com/Ognian/sdmon;protocol=https;branch=master"
9PV = "0.9.0" 9PV = "0.9.0"
10SRCREV = "4dff9b690e8d4454fada6abfbb6b32fcb794968c" 10SRCREV = "4dff9b690e8d4454fada6abfbb6b32fcb794968c"
11 11
12S = "${WORKDIR}/git"
13 12
14do_compile() { 13do_compile() {
15 oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}" 14 oe_runmake -C ${S}/src CC="${CC}" CFLAGS="${CFLAGS} -D_REENTRANT -DVERSION=\"\\\"${PV}\\\"\"" LDFLAGS="${LDFLAGS}"
diff --git a/meta-oe/recipes-support/sdparm/sdparm_1.12.bb b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
index a5f98e6723..1143d157c9 100644
--- a/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
+++ b/meta-oe/recipes-support/sdparm/sdparm_1.12.bb
@@ -6,7 +6,7 @@ SECTION = "console/utils"
6LICENSE = "BSD-3-Clause" 6LICENSE = "BSD-3-Clause"
7LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \ 7LIC_FILES_CHKSUM = "file://COPYING;md5=ecab6c36b7ba82c675581dd0afde36f7 \
8 file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64" 8 file://lib/BSD_LICENSE;md5=12cde17a04c30dece2752f36b7192c64"
9DEPENDS="sg3-utils" 9DEPENDS = "sg3-utils"
10SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \ 10SRC_URI = "http://sg.danny.cz/sg/p/${BPN}-${PV}.tgz \
11 file://make-sysroot-work.patch \ 11 file://make-sysroot-work.patch \
12 " 12 "
@@ -17,7 +17,6 @@ UPSTREAM_CHECK_REGEX = "sdparm-(?P<pver>\d+(\.\d+)+)\.tgz"
17PACKAGES =+ "${PN}-scripts" 17PACKAGES =+ "${PN}-scripts"
18RDEPENDS:${PN}-scripts += "bash ${PN}" 18RDEPENDS:${PN}-scripts += "bash ${PN}"
19 19
20SRC_URI[md5sum] = "2902fd29e6834fd62c16bb5d1ac53c7e"
21SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124" 20SRC_URI[sha256sum] = "e7f84247069da9a0c293963948d8aba8e5897a13e35e5476c8258acb7ca3a124"
22 21
23inherit autotools 22inherit autotools
diff --git a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
index 82994331ee..1d7e29ecc5 100644
--- a/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
+++ b/meta-oe/recipes-support/serial-utils/pty-forward-native.bb
@@ -6,7 +6,7 @@ SRCREV = "00dbec2636ae0385ad028587e20e446272ff97ec"
6PV = "1.1+git" 6PV = "1.1+git"
7 7
8SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master" 8SRC_URI = "git://github.com/freesmartphone/cornucopia.git;protocol=https;branch=master"
9S = "${WORKDIR}/git/tools/serial_forward" 9S = "${UNPACKDIR}/${BP}/tools/serial_forward"
10 10
11inherit autotools native 11inherit autotools native
12 12
diff --git a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
index 541ae84a93..05e965fc63 100644
--- a/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
+++ b/meta-oe/recipes-support/serial-utils/serial-forward_git.bb
@@ -9,6 +9,6 @@ SRC_URI = "git://github.com/freesmartphone/cornucopia.git;branch=master;protocol
9 file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \ 9 file://0001-serial_forward-Disable-default-static-linking.patch;striplevel=3 \
10 file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \ 10 file://0001-correct-the-typo-in-include-file-name-string.h.patch;striplevel=3 \
11 " 11 "
12S = "${WORKDIR}/git/tools/serial_forward" 12S = "${UNPACKDIR}/${BP}/tools/serial_forward"
13 13
14inherit autotools 14inherit autotools
diff --git a/meta-oe/recipes-support/serial/serial_1.2.1.bb b/meta-oe/recipes-support/serial/serial_1.2.1.bb
index c3f13d1af5..42151da532 100644
--- a/meta-oe/recipes-support/serial/serial_1.2.1.bb
+++ b/meta-oe/recipes-support/serial/serial_1.2.1.bb
@@ -11,7 +11,6 @@ SRC_URI = " \
11SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f" 11SRCREV = "10ac4e1c25c2cda1dc0a32a8e12b87fd89f3bb4f"
12SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96" 12SRC_URI[sha256sum] = "c8cd235dda2ef7d977ba06dfcb35c35e42f45cfd9149ba3ad257756123d8ff96"
13 13
14S = "${WORKDIR}/git"
15 14
16inherit cmake 15inherit cmake
17 16
diff --git a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
index 6c3d813983..4af20fe72a 100644
--- a/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
+++ b/meta-oe/recipes-support/sg3-utils/sg3-utils_1.48.bb
@@ -17,6 +17,6 @@ SRC_URI[sha256sum] = "d62b6c3cf20390fa7357044390084166d25f1d932a1135c450b69fe5c2
17 17
18inherit autotools-brokensep 18inherit autotools-brokensep
19 19
20S = "${WORKDIR}/sg3_utils-${PV}" 20S = "${UNPACKDIR}/sg3_utils-${PV}"
21 21
22RDEPENDS:${PN} += "bash" 22RDEPENDS:${PN} += "bash"
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch
new file mode 100644
index 0000000000..507c0c99cb
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0001-ISO-C23-Backport-stdbool.m4.patch
@@ -0,0 +1,213 @@
1From c349e9656440fcde2f71950d466fcddaa9a59f72 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Fri, 4 Apr 2025 14:19:00 +0900
4Subject: [PATCH 1/3] ISO C23: Backport stdbool.m4
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9From: Petr Písař <ppisar@redhat.com>
10
11The bundled gnulib check for stdbool.h did not account for ISO C23
12which provides its own false and true keywords. As a result stdbool.h
13presence was not correctly detected and libopts/compat/compat.h,
14bundled from AutoGen, failed to compile with GCC 15 which defaults to
15ISO C23:
16
17 In file included from autoopts/project.h:30,
18 from libopts.c:2:
19 ./compat/compat.h:188:19: error: cannot use keyword ‘false’ as enumeration
20constant
21 188 | typedef enum { false = 0, true = 1 } _Bool;
22 | ^~~~~
23 ./compat/compat.h:188:19: note: ‘false’ is a keyword with ‘-std=c23’ onwards
24 ./compat/compat.h:188:41: error: expected ‘;’, identifier or ‘(’ before
25‘_Bool’
26 188 | typedef enum { false = 0, true = 1 } _Bool;
27 | ^~~~~
28
29Signed-off-by: Petr Písař <ppisar@redhat.com>
30
31Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00002.html]
32Signed-off-by: mark.yang <mark.yang@lge.com>
33---
34 m4/stdbool.m4 | 129 +++++++++++++++++++++++++++++---------------------
35 1 file changed, 74 insertions(+), 55 deletions(-)
36
37diff --git a/m4/stdbool.m4 b/m4/stdbool.m4
38index 7273b82..8e00e4a 100644
39--- a/m4/stdbool.m4
40+++ b/m4/stdbool.m4
41@@ -1,27 +1,40 @@
42 # Check for stdbool.h that conforms to C99.
43
44-dnl Copyright (C) 2002-2006, 2009-2015 Free Software Foundation, Inc.
45+dnl Copyright (C) 2002-2006, 2009-2023 Free Software Foundation, Inc.
46 dnl This file is free software; the Free Software Foundation
47 dnl gives unlimited permission to copy and/or distribute it,
48 dnl with or without modifications, as long as this notice is preserved.
49
50-#serial 5
51+#serial 10
52
53 # Prepare for substituting <stdbool.h> if it is not supported.
54
55 AC_DEFUN([AM_STDBOOL_H],
56 [
57 AC_REQUIRE([AC_CHECK_HEADER_STDBOOL])
58+ AC_REQUIRE([AC_CANONICAL_HOST])
59
60- # Define two additional variables used in the Makefile substitution.
61-
62+ dnl On some platforms, <stdbool.h> does not exist or does not conform to C99.
63+ dnl On Solaris 10 with CC=cc CXX=CC, <stdbool.h> exists but is not usable
64+ dnl in C++ mode (and no <cstdbool> exists). In this case, we use our
65+ dnl replacement, also in C mode (for binary compatibility between C and C++).
66 if test "$ac_cv_header_stdbool_h" = yes; then
67- STDBOOL_H=''
68+ case "$host_os" in
69+ solaris*)
70+ if test -z "$GCC"; then
71+ GL_GENERATE_STDBOOL_H=true
72+ else
73+ GL_GENERATE_STDBOOL_H=false
74+ fi
75+ ;;
76+ *)
77+ GL_GENERATE_STDBOOL_H=false
78+ ;;
79+ esac
80 else
81- STDBOOL_H='stdbool.h'
82+ GL_GENERATE_STDBOOL_H=true
83 fi
84- AC_SUBST([STDBOOL_H])
85- AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test -n "$STDBOOL_H"])
86+ AM_CONDITIONAL([GL_GENERATE_STDBOOL_H], [test "$GL_GENERATE_STDBOOL_H" = "true"])
87
88 if test "$ac_cv_type__Bool" = yes; then
89 HAVE__BOOL=1
90@@ -31,70 +44,76 @@ AC_DEFUN([AM_STDBOOL_H],
91 AC_SUBST([HAVE__BOOL])
92 ])
93
94-# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future.
95-AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H])
96-
97-# This version of the macro is needed in autoconf <= 2.68.
98+m4_version_prereq([2.72], [], [
99
100 AC_DEFUN([AC_CHECK_HEADER_STDBOOL],
101- [AC_CACHE_CHECK([for stdbool.h that conforms to C99],
102+ [AC_CHECK_TYPES([_Bool])
103+ AC_CACHE_CHECK([for stdbool.h that conforms to C99 or later],
104 [ac_cv_header_stdbool_h],
105 [AC_COMPILE_IFELSE(
106 [AC_LANG_PROGRAM(
107- [[
108- #include <stdbool.h>
109- #ifndef bool
110- "error: bool is not defined"
111+ [[#include <stdbool.h>
112+
113+ /* "true" and "false" should be usable in #if expressions and
114+ integer constant expressions, and "bool" should be a valid
115+ type name.
116+
117+ Although C99 requires bool, true, and false to be macros,
118+ C23 and C++11 overrule that, so do not test for that.
119+ Although C99 requires __bool_true_false_are_defined and
120+ _Bool, C23 says they are obsolescent, so do not require
121+ them. */
122+
123+ #if !true
124+ #error "'true' is not true"
125 #endif
126- #ifndef false
127- "error: false is not defined"
128+ #if true != 1
129+ #error "'true' is not equal to 1"
130 #endif
131+ char b[true == 1 ? 1 : -1];
132+ char c[true];
133+
134 #if false
135- "error: false is not 0"
136+ #error "'false' is not false"
137 #endif
138- #ifndef true
139- "error: true is not defined"
140- #endif
141- #if true != 1
142- "error: true is not 1"
143- #endif
144- #ifndef __bool_true_false_are_defined
145- "error: __bool_true_false_are_defined is not defined"
146+ #if false != 0
147+ #error "'false' is not equal to 0"
148 #endif
149+ char d[false == 0 ? 1 : -1];
150+
151+ enum { e = false, f = true, g = false * true, h = true * 256 };
152+
153+ char i[(bool) 0.5 == true ? 1 : -1];
154+ char j[(bool) 0.0 == false ? 1 : -1];
155+ char k[sizeof (bool) > 0 ? 1 : -1];
156+
157+ struct sb { bool s: 1; bool t; } s;
158+ char l[sizeof s.t > 0 ? 1 : -1];
159
160- struct s { _Bool s: 1; _Bool t; } s;
161-
162- char a[true == 1 ? 1 : -1];
163- char b[false == 0 ? 1 : -1];
164- char c[__bool_true_false_are_defined == 1 ? 1 : -1];
165- char d[(bool) 0.5 == true ? 1 : -1];
166- /* See body of main program for 'e'. */
167- char f[(_Bool) 0.0 == false ? 1 : -1];
168- char g[true];
169- char h[sizeof (_Bool)];
170- char i[sizeof s.t];
171- enum { j = false, k = true, l = false * true, m = true * 256 };
172 /* The following fails for
173 HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */
174- _Bool n[m];
175- char o[sizeof n == m * sizeof n[0] ? 1 : -1];
176- char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
177+ bool m[h];
178+ char n[sizeof m == h * sizeof m[0] ? 1 : -1];
179+ char o[-1 - (bool) 0 < 0 ? 1 : -1];
180 /* Catch a bug in an HP-UX C compiler. See
181- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
182- http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
183+ https://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
184+ https://lists.gnu.org/r/bug-coreutils/2005-11/msg00161.html
185 */
186- _Bool q = true;
187- _Bool *pq = &q;
188+ bool p = true;
189+ bool *pp = &p;
190 ]],
191 [[
192- bool e = &s;
193- *pq |= q;
194- *pq |= ! q;
195- /* Refer to every declared value, to avoid compiler optimizations. */
196- return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l
197- + !m + !n + !o + !p + !q + !pq);
198+ bool ps = &s;
199+ *pp |= p;
200+ *pp |= ! p;
201+
202+ /* Refer to every declared value, so they cannot be
203+ discarded as unused. */
204+ return (!b + !c + !d + !e + !f + !g + !h + !i + !j + !k
205+ + !l + !m + !n + !o + !p + !pp + !ps);
206 ]])],
207 [ac_cv_header_stdbool_h=yes],
208 [ac_cv_header_stdbool_h=no])])
209- AC_CHECK_TYPES([_Bool])
210-])
211+])# AC_CHECK_HEADER_STDBOOL
212+
213+]) # m4_version_prereq 2.72
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch
new file mode 100644
index 0000000000..6d8a5e2128
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch
@@ -0,0 +1,47 @@
1From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 14 Aug 2024 15:24:57 -0700
4Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during
5 the configure step
6
7This lets us set it to the canonical path /bin/bash, even on systems
8where both /bin/bash and /usr/bin/bash are available, and therefore
9which(1) might return /usr/bin/bash (depending on PATH order).
10
11Both copies of libopts.m4 are marked as generated files, but the files
12from which they were generated do not seem to be present in the sharutils
13package. This change is equivalent to part of a 2016 autogen commit
14<https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>.
15
16Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a]
17
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 libopts/m4/libopts.m4 | 1 +
21 m4/libopts.m4 | 1 +
22 2 files changed, 2 insertions(+)
23
24diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4
25index 1a896d9..3b88426 100644
26--- a/libopts/m4/libopts.m4
27+++ b/libopts/m4/libopts.m4
28@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
29 AC_PROG_SED
30 [while :
31 do
32+ test -x "$POSIX_SHELL" && break
33 POSIX_SHELL=`which bash`
34 test -x "$POSIX_SHELL" && break
35 POSIX_SHELL=`which dash`
36diff --git a/m4/libopts.m4 b/m4/libopts.m4
37index c7ba4f3..a1127e1 100644
38--- a/m4/libopts.m4
39+++ b/m4/libopts.m4
40@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[
41 AC_PROG_SED
42 [while :
43 do
44+ test -x "$POSIX_SHELL" && break
45 POSIX_SHELL=`which bash`
46 test -x "$POSIX_SHELL" && break
47 POSIX_SHELL=`which dash`
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch b/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch
new file mode 100644
index 0000000000..44991cad1b
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch
@@ -0,0 +1,49 @@
1From 01c13c5b455ec8d51240af20f59324b2ed15a337 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
3Date: Fri, 4 Apr 2025 14:20:05 +0900
4Subject: [PATCH 2/3] ISO C23: Port getcwd.m4 to ISO C23
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9From: Petr Písař <ppisar@redhat.com>
10
11Some confgure tests failed because of function arguments missing from
12the prototypes:
13
14 configure:16105: checking whether getcwd (NULL, 0) allocates memory for
15result
16 configure:16162: gcc -o conftest -g -O2 conftest.c >&5
17 conftest.c:186:16: error: conflicting types for 'getcwd'; have 'char
18*(void)'
19 186 | char *getcwd ();
20 | ^~~~~~
21 In file included from conftest.c:181:
22 /usr/include/unistd.h:531:14: note: previous declaration of 'getcwd' with
23type 'char *(char *, size_t)'
24
25This patch fixes it.
26
27Maintainer is encouraged to rebase the m4 files to the latest gnulib.
28
29Signed-off-by: Petr Písař <ppisar@redhat.com>
30
31Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00003.html]
32Signed-off-by: mark.yang <mark.yang@lge.com>
33---
34 m4/getcwd.m4 | 2 +-
35 1 file changed, 1 insertion(+), 1 deletion(-)
36
37diff --git a/m4/getcwd.m4 b/m4/getcwd.m4
38index b9fbcec..6f24b14 100644
39--- a/m4/getcwd.m4
40+++ b/m4/getcwd.m4
41@@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL],
42 # include <direct.h>
43 # endif
44 # ifndef getcwd
45- char *getcwd ();
46+ char *getcwd (char *buf, size_t size);
47 # endif
48 ]], [[
49 #if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
diff --git a/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch b/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch
new file mode 100644
index 0000000000..57e0ac3ed6
--- /dev/null
+++ b/meta-oe/recipes-support/sharutils/sharutils/0003-ISO-C23-Port-the-code-to-ISO-C23.patch
@@ -0,0 +1,143 @@
1From 4e50196673fc14bd6081e8a78cc940199566ba55 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Fri, 4 Apr 2025 14:38:51 +0900
4Subject: [PATCH 3/3] ISO C23: Port the code to ISO C23
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9From: Petr Písař <ppisar@redhat.com>
10
11With GCC 15, which defaults to ISO 23, a build failed, for example like
12this:
13
14 gcc -DLOCALEDIR=\"/usr/local/share/locale\" -DHAVE_CONFIG_H -I. -I..
15-I../libopts -I. -I.. -I../lib -I
16 ../lib -I../intl -Wno-format-contains-nul -g -O2 -Wno-format-contains-nul
17-c -o shar.o shar.c
18 In file included from local.h:23,
19 from shar-opts.h:354,
20 from shar.c:46:
21 ../lib/system.h:78:7: error: conflicting types for ‘fdopen’; have ‘FILE
22*(void)’
23 78 | FILE *fdopen ();
24 | ^~~~~~
25
26The cause is that ISO C23 changed a meaning of an empty argument list
27from an unspecified list to no arguments.
28
29Also K&R syntax is now deprecated and the compiler warned:
30
31 encode.c: In function ‘write_encoded_bytes’:
32 encode.c:33:1: warning: old-style function definition
33[-Wold-style-definition]
34 33 | write_encoded_bytes (group, file)
35 | ^~~~~~~~~~~~~~~~~~~
36
37This patch fixes both the erros and the warnigs by specifying all the
38arguments in the modern syntax.
39
40Signed-off-by: Petr Písař <ppisar@redhat.com>
41
42Upstream-Status: Backport [https://lists.gnu.org/r/bug-gnu-utils/2025-03/msg00001.html]
43Signed-off-by: mark.yang <mark.yang@lge.com>
44---
45 lib/system.h | 6 +++---
46 src/encode.c | 13 +++----------
47 src/shar.c | 3 +--
48 src/uudecode.c | 2 +-
49 4 files changed, 8 insertions(+), 16 deletions(-)
50
51diff --git a/lib/system.h b/lib/system.h
52index 2b9846b..811e8cf 100644
53--- a/lib/system.h
54+++ b/lib/system.h
55@@ -52,7 +52,7 @@ typedef enum {false = 0, true = 1} bool;
56 #endif
57
58 #if !HAVE_DECL_STRTOIMAX && !defined strtoimax
59-intmax_t strtoimax ();
60+intmax_t strtoimax (const char *nptr, char **endptr, int base);
61 #endif
62
63 #if HAVE_STRING_H
64@@ -75,8 +75,8 @@ intmax_t strtoimax ();
65 # include <unistd.h>
66 #endif
67
68-FILE *fdopen ();
69-FILE *popen ();
70+FILE *fdopen (int fd, const char *mode);
71+FILE *popen (const char *command, const char *type);
72
73 /* Global functions of the shar package. */
74
75diff --git a/src/encode.c b/src/encode.c
76index 09e0c69..b1de8bd 100644
77--- a/src/encode.c
78+++ b/src/encode.c
79@@ -30,9 +30,7 @@
80 `------------------------------------------*/
81
82 static void
83-write_encoded_bytes (group, file)
84- char *group;
85- FILE *file;
86+write_encoded_bytes (char *group, FILE *file)
87 {
88 int c1, c2, c3, c4;
89
90@@ -52,10 +50,7 @@ write_encoded_bytes (group, file)
91 `--------------------------------------------------------------------*/
92
93 static int
94-read_raw_bytes (file, buffer, buffer_size)
95- FILE *file;
96- char *buffer;
97- int buffer_size;
98+read_raw_bytes (FILE *file, char *buffer, int buffer_size)
99 {
100 int character;
101 int counter;
102@@ -75,9 +70,7 @@ read_raw_bytes (file, buffer, buffer_size)
103 `----------------------------------------------------*/
104
105 void
106-copy_file_encoded (input, output)
107- FILE *input;
108- FILE *output;
109+copy_file_encoded (FILE *input, FILE *output)
110 {
111 char buffer[LINE_BUFFER_SIZE];
112 int counter;
113diff --git a/src/shar.c b/src/shar.c
114index 6d7ed1d..b5e84ff 100644
115--- a/src/shar.c
116+++ b/src/shar.c
117@@ -1,4 +1,3 @@
118-
119 static const char cright_years_z[] =
120
121 /* Handle so called `shell archives'.
122@@ -109,7 +108,7 @@ static inline unsigned char to_uchar (char ch) { return ch; }
123 #define IS_GRAPH(_c) (isprint (to_uchar (_c)) && !isspace (to_uchar (_c)))
124 #endif
125
126-struct tm *localtime ();
127+struct tm *localtime (const time_t *timep);
128
129 #if MSDOS
130 /* 1 extra for CR. */
131diff --git a/src/uudecode.c b/src/uudecode.c
132index 0621c99..b8a316e 100644
133--- a/src/uudecode.c
134+++ b/src/uudecode.c
135@@ -82,7 +82,7 @@ static char const cright_years_z[] =
136 #define UU_CHMOD(_n, _fd, _m) chmod ((_n), UU_MODE_BITS(_m))
137 #endif
138
139-struct passwd *getpwnam ();
140+struct passwd *getpwnam (const char *name);
141
142 static uudecode_exit_code_t read_stduu(
143 const char *inname, const char *outname);
diff --git a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
index 2a16b18288..45bf341063 100644
--- a/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
+++ b/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb
@@ -1,7 +1,7 @@
1SUMMARY = "This is the set of GNU shar utilities." 1SUMMARY = "This is the set of GNU shar utilities."
2HOMEPAGE = "http://www.gnu.org/software/sharutils/" 2HOMEPAGE = "http://www.gnu.org/software/sharutils/"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE="GPL-3.0-or-later" 4LICENSE = "GPL-3.0-or-later"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" 5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6 6
7inherit gettext autotools update-alternatives 7inherit gettext autotools update-alternatives
@@ -13,10 +13,15 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \
13 file://0001-Fix-building-with-GCC-10.patch \ 13 file://0001-Fix-building-with-GCC-10.patch \
14 file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ 14 file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \
15 file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ 15 file://0001-configure.ac-Check-and-define-intmax_t-type.patch \
16 file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \
17 file://0001-ISO-C23-Backport-stdbool.m4.patch \
18 file://0002-ISO-C23-Port-getcwd.m4-to-ISO-C23.patch \
19 file://0003-ISO-C23-Port-the-code-to-ISO-C23.patch \
16 " 20 "
17SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800"
18SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" 21SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637"
19 22
23EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh"
24
20do_install:append() { 25do_install:append() {
21 if [ -e ${D}${libdir}/charset.alias ] 26 if [ -e ${D}${libdir}/charset.alias ]
22 then 27 then
diff --git a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb b/meta-oe/recipes-support/smarty/smarty_4.4.1.bb
deleted file mode 100644
index e0979bb5aa..0000000000
--- a/meta-oe/recipes-support/smarty/smarty_4.4.1.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1DESCRIPTION = "the compiling PHP template engine"
2SECTION = "console/network"
3HOMEPAGE = "https://www.smarty.net/"
4
5LICENSE = "GPL-3.0-only"
6LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
7
8DEPENDS += "php"
9
10SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=support/4.3"
11
12SRCREV = "f4152e9b814ae2369b6e4935c05e1e0c3654318d"
13
14S = "${WORKDIR}/git"
15
16do_install() {
17 install -d ${D}${datadir}/php/smarty3/libs/
18 install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/
19
20 install -d ${D}${datadir}/php/smarty3/libs/plugins
21 install -m 0644 ${S}/libs/plugins/*.php ${D}${datadir}/php/smarty3/libs/plugins/
22
23 install -d ${D}${datadir}/php/smarty3/libs/sysplugins
24 install -m 0644 ${S}/libs/sysplugins/*.php ${D}${datadir}/php/smarty3/libs/sysplugins/
25}
26FILES:${PN} = "${datadir}/php/smarty3/"
27
28CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/smarty/smarty_5.4.5.bb b/meta-oe/recipes-support/smarty/smarty_5.4.5.bb
new file mode 100644
index 0000000000..047f10589d
--- /dev/null
+++ b/meta-oe/recipes-support/smarty/smarty_5.4.5.bb
@@ -0,0 +1,37 @@
1SUMMARY = "Template engine for PHP"
2DESCRIPTION = "\
3 Smarty facilitates the separation of presentation (HTML/CSS) from \
4 application logic. This implies that PHP code is application logic, and is \
5 separated from the presentation. \
6"
7HOMEPAGE = "https://smarty-php.github.io/smarty/"
8BUGTRACKER = "https://github.com/smarty-php/smarty/issues"
9
10LICENSE = "GPL-3.0-only"
11LIC_FILES_CHKSUM = "file://LICENSE;md5=2c0f216b2120ffc367e20f2b56df51b3"
12
13SRC_URI = "git://github.com/smarty-php/smarty.git;protocol=https;branch=master;tag=v${PV}"
14
15SRCREV = "e26f82d02c4d18fc82094c28fbc65f711e39ed5d"
16
17
18INHIBIT_DEFAULT_DEPS = "1"
19
20# `make clean` removes files, they can't be rebuild with `make all`
21CLEANBROKEN = "1"
22
23do_configure[noexec] = "1"
24do_compile[noexec] = "1"
25
26do_install() {
27 install -d ${D}${datadir}/php/smarty3/libs/
28 install -m 0644 ${S}/libs/*.php ${D}${datadir}/php/smarty3/libs/
29
30 install -d ${D}${datadir}/php/smarty3/src/
31 cp -rf ${S}/src/* ${D}${datadir}/php/smarty3/src/
32}
33FILES:${PN} += "${datadir}/php/smarty3/"
34
35RDEPENDS:${PN} = "php"
36
37CVE_STATUS[CVE-2020-10375] = "cpe-incorrect: The recipe used in the meta-openembedded is a different smarty package compared to the one which has the CVE issue."
diff --git a/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
new file mode 100644
index 0000000000..ec8594629e
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch
@@ -0,0 +1,30 @@
1From d103eaeae169708ca567f092182a89b79e5ab9db Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Oct 2024 07:52:33 -0700
4Subject: [PATCH 1/2] Include linux/types.h for __u16/__u32/__u64 type
5
6This header is included indirectly with glibc but when using musl
7it ends up with compilation failure
8
9BcachefsUtils.cc:85:20: error: use of undeclared identifier '__u32'
10 85 | args.dirfd = (__u32) fddst;
11 | ^
12
13Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 snapper/BcachefsUtils.cc | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/snapper/BcachefsUtils.cc b/snapper/BcachefsUtils.cc
20index e9163ffb..1d328a78 100644
21--- a/snapper/BcachefsUtils.cc
22+++ b/snapper/BcachefsUtils.cc
23@@ -24,6 +24,7 @@
24
25 #include <cstring>
26 #include <cerrno>
27+#include <linux/types.h>
28 #include <sys/stat.h>
29 #include <sys/ioctl.h>
30
diff --git a/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
new file mode 100644
index 0000000000..b915fda257
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper/0002-Use-statvfs-instead-of-statvfs64.patch
@@ -0,0 +1,37 @@
1From 0b39f4484553c796cb300fb4933ea314e91d913b Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 20 Oct 2024 07:55:23 -0700
4Subject: [PATCH 2/2] Use statvfs instead of statvfs64
5
6when using LFS64 these functions are same and also
7on 64bit systems they are same. musl is using 64bit off_t
8by default and does not define LFS64 variants of these functions
9and it ends up in build errors
10
11Taken from Alpine Linux: [https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/testing/snapper/statvfs64.patch]
12
13Upstream-Status: Submitted [https://github.com/openSUSE/snapper/pull/945]
14
15Signed-off-by: Markus Volk <f_l_k@t-online.de>
16Signed-off-by: Khem Raj <raj.khem@gmail.com>
17---
18 snapper/FileUtils.cc | 6 +++---
19 1 file changed, 3 insertions(+), 3 deletions(-)
20
21diff --git a/snapper/FileUtils.cc b/snapper/FileUtils.cc
22index d4034279..4c8578a1 100644
23--- a/snapper/FileUtils.cc
24+++ b/snapper/FileUtils.cc
25@@ -387,9 +387,9 @@ namespace snapper
26 std::pair<unsigned long long, unsigned long long>
27 SDir::statvfs() const
28 {
29- struct statvfs64 fsbuf;
30- if (fstatvfs64(dirfd, &fsbuf) != 0)
31- SN_THROW(IOErrorException(sformat("statvfs64 failed path:%s errno:%d (%s)", base_path.c_str(),
32+ struct statvfs fsbuf;
33+ if (fstatvfs(dirfd, &fsbuf) != 0)
34+ SN_THROW(IOErrorException(sformat("statvfs failed path:%s errno:%d (%s)", base_path.c_str(),
35 errno, stringerror(errno).c_str())));
36
37 // f_bavail is used (not f_bfree) since df seems to do the
diff --git a/meta-oe/recipes-support/snapper/snapper_0.11.2.bb b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
new file mode 100644
index 0000000000..887615ef45
--- /dev/null
+++ b/meta-oe/recipes-support/snapper/snapper_0.11.2.bb
@@ -0,0 +1,40 @@
1SUMMARY = "Snapper is a tool for Linux file system snapshot management"
2HOMEPAGE = "https://github.com/openSUSE/snapper"
3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
5
6DEPENDS = "acl boost btrfs-tools dbus e2fsprogs json-c libxml2 lvm2 ncurses zlib"
7
8# Build separation is slightly broken
9inherit autotools-brokensep pkgconfig gettext
10
11SRC_URI = " \
12 git://github.com/openSUSE/snapper.git;protocol=https;branch=master \
13 file://0001-Include-linux-types.h-for-__u16-__u32-__u64-type.patch \
14 file://0002-Use-statvfs-instead-of-statvfs64.patch \
15"
16SRCREV = "6c603565f36e9996d85045c8012cd04aba5f3708"
17
18
19EXTRA_OECONF += "--disable-zypp"
20
21PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'api-documentation systemd pam', d)}"
22PACKAGECONFIG[pam] = "--enable-pam --with-pam-security=${base_libdir}/security, --disable-pam,libpam"
23PACKAGECONFIG[systemd] = "--enable-systemd,--disable-systemd"
24PACKAGECONFIG[api-documentation] = "--enable-doc,--disable-doc,libxslt-native docbook-xsl-stylesheets-native"
25
26# Avoid HOSTTOOLS path in binaries
27export DIFFBIN = "${bindir}/diff"
28export RMBIN = "${bindir}/rm"
29export TOUCHBIN = "${bindir}/touch"
30export CPBIN = "${bindir}/cp"
31
32do_install:append() {
33 install -d ${D}${sysconfdir}/sysconfig
34 install -m0644 ${S}/data/default-config ${D}${sysconfdir}/sysconfig/snapper
35}
36
37FILES:${PN} += "${base_libdir}/security ${nonarch_libdir} ${systemd_system_unitdir} ${datadir}"
38
39# bash is needed for the testsuite
40RDEPENDS:${PN} = "bash diffutils util-linux util-linux-mount"
diff --git a/meta-oe/recipes-support/source-highlight/source-highlight_git.bb b/meta-oe/recipes-support/source-highlight/source-highlight_git.bb
new file mode 100644
index 0000000000..8b0a38095f
--- /dev/null
+++ b/meta-oe/recipes-support/source-highlight/source-highlight_git.bb
@@ -0,0 +1,35 @@
1SUMMARY = "Syntax highlight utility"
2DESCRIPTION = "Source-highlight converts source code to formatted text with syntax highlighting."
3HOMEPAGE = "https://www.gnu.org/software/src-highlite/"
4LICENSE = "GPL-3.0-only"
5SECTION = "libs"
6LIC_FILES_CHKSUM = "file://COPYING;md5=ff95bfe019feaf92f524b73dd79e76eb"
7
8SRCREV = "894cacd0799ca60afa359a63782729dec76cbb79"
9PV = "3.1.9+git"
10SRC_URI = "git://git.savannah.gnu.org/git/src-highlite.git;protocol=https;branch=master"
11
12inherit autotools pkgconfig
13
14DEPENDS:append = " bison-native boost"
15
16DEPENDS:append:class-target = " ${BPN}-native"
17
18EXTRA_OECONF = "--with-boost-regex=boost_regex"
19
20BBCLASSEXTEND = "native nativesdk"
21
22PACKAGES += "${PN}-tools ${PN}-data"
23
24RDEPENDS:${PN} = "boost-regex ${PN}-data"
25RDEPENDS:${PN}-tools = "${PN} ${PN}-data bash"
26
27FILES:${PN} = "${libdir}/*${SOLIBS}"
28FILES:${PN}-data = "${datadir}/source-highlight"
29FILES:${PN}-tools = "${bindir} ${sysconfdir}/bash_completion.d"
30
31# source-highlight is using its own binary from the build tree to make documentation
32# let's substitute the native binary instead
33do_configure:prepend:class-target () {
34 sed -i -e 's,^SRCHILITEEXE = $(top_builddir).*,SRCHILITEEXE = source-highlight,' ${S}/doc/Makefile.am
35}
diff --git a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
index 9dc393fd08..9fef39216f 100644
--- a/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
+++ b/meta-oe/recipes-support/span-lite/span-lite_0.11.0.bb
@@ -6,6 +6,5 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c"
6SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https" 6SRC_URI += "git://github.com/martinmoene/span-lite;branch=master;protocol=https"
7SRCREV = "50f55c59d1b66910837313c40d11328d03447a41" 7SRCREV = "50f55c59d1b66910837313c40d11328d03447a41"
8 8
9S = "${WORKDIR}/git"
10 9
11inherit cmake 10inherit cmake
diff --git a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb b/meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb
index 19bac0be89..25d8249917 100644
--- a/meta-oe/recipes-support/spdlog/spdlog_1.14.1.bb
+++ b/meta-oe/recipes-support/spdlog/spdlog_1.15.0.bb
@@ -3,12 +3,12 @@ HOMEPAGE = "https://github.com/gabime/spdlog/wiki"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=9573510928429ad0cbe5ba4de77546e9"
5 5
6SRCREV = "27cb4c76708608465c413f6d0e6b8d99a4d84302" 6PV .= "+git"
7SRCREV = "96a8f6250cbf4e8c76387c614f666710a2fa9bad"
7SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x" 8SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x"
8 9
9DEPENDS = "fmt" 10DEPENDS += "fmt"
10 11
11S = "${WORKDIR}/git"
12 12
13inherit cmake 13inherit cmake
14 14
diff --git a/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-oe/recipes-support/spitools/spitools_git.bb
index 1e3d6beaf4..e313685d95 100644
--- a/meta-oe/recipes-support/spitools/spitools_git.bb
+++ b/meta-oe/recipes-support/spitools/spitools_git.bb
@@ -1,12 +1,11 @@
1DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices" 1DESCRIPTION = "This package contains some simple command line tools to help using Linux spidev devices"
2HOMEPAGE = "https://github.com/cpb-/spi-tools" 2HOMEPAGE = "https://github.com/cpb-/spi-tools"
3LICENSE="GPL-2.0-only" 3LICENSE = "GPL-2.0-only"
4LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381"
5 5
6PV = "1.0.2" 6PV = "1.0.2"
7SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00" 7SRCREV = "1748e092425a4a0ff693aa347062a57fc1ffdd00"
8 8
9S = "${WORKDIR}/git"
10 9
11SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master" 10SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https;branch=master"
12 11
diff --git a/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch b/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch
new file mode 100644
index 0000000000..fe55fc5c87
--- /dev/null
+++ b/meta-oe/recipes-support/srecord/files/0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch
@@ -0,0 +1,36 @@
1From 69290e4d727492a63a2a4424368a476b86ef8183 Mon Sep 17 00:00:00 2001
2From: "mark.yang" <mark.yang@lge.com>
3Date: Mon, 7 Apr 2025 17:18:34 +0900
4Subject: [PATCH] fix build failure with gcc 15 by adding cstdint header
5
6Fixes #79
7
8srecord/input/file/hp64k.h:82:21: error: ‘uint16_t’ has not been declared
9 82 | bool read_u16be(uint16_t *dest);
10 | ^~~~~~~~
11/home/abuild/rpmbuild/BUILD/srecord-1.65.0-build/srecord-1.65.0-Source/./srecord/input/file/hp64k.h:1:1: note: ‘uint16_t’ is defined in header ‘<cstdint>’; this is probably fixable by adding ‘#include <cstdint>’
12 +++ |+#include <cstdint>
13 1 | //
14make[2]: *** [srecord/CMakeFiles/lib_srecord.dir/build.make:222: srecord/CMakeFiles/lib_srecord.dir/arglex/tool/input.cc.o] Error 1
15
16 * From gcc 13, cstdint header must be explicitly included for uint_X data types.
17 * See also: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
18
19Upstream-Status: Submitted [https://github.com/sierrafoxtrot/srecord/pull/80]
20Signed-off-by: mark.yang <mark.yang@lge.com>
21---
22 srecord/input/file/hp64k.h | 1 +
23 1 file changed, 1 insertion(+)
24
25diff --git a/srecord/input/file/hp64k.h b/srecord/input/file/hp64k.h
26index a3f8a6d..205e1e4 100644
27--- a/srecord/input/file/hp64k.h
28+++ b/srecord/input/file/hp64k.h
29@@ -21,6 +21,7 @@
30 #define LIB_INPUT_FILE_HP64K
31
32 #include <srecord/input/file.h>
33+#include <cstdint>
34
35 namespace srecord {
36
diff --git a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
index 3e8a87d07f..1797112a90 100644
--- a/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
+++ b/meta-oe/recipes-support/srecord/srecord_1.65.0.bb
@@ -7,9 +7,11 @@ SRC_URI = " \
7 https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \ 7 https://sourceforge.net/projects/${BPN}/files/srecord/${@oe.utils.trim_version('${PV}', 2)}/${BP}-Source.tar.gz \
8 file://0001-Disable-doxygen.patch \ 8 file://0001-Disable-doxygen.patch \
9 file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \ 9 file://0001-cmake-Do-not-try-to-compute-library-dependencies-dur.patch \
10 file://0001-cmake-respect-explicit-install-prefix.patch" 10 file://0001-cmake-respect-explicit-install-prefix.patch \
11 file://0001-fix-build-failure-with-gcc-15-by-adding-cstdint-head.patch \
12"
11SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644" 13SRC_URI[sha256sum] = "81c3d07cf15ce50441f43a82cefd0ac32767c535b5291bcc41bd2311d1337644"
12S = "${WORKDIR}/${BP}-Source" 14S = "${UNPACKDIR}/${BP}-Source"
13 15
14UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases" 16UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/srecord/files/releases"
15 17
diff --git a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
index bf9de31f84..d634ca1b6e 100644
--- a/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
+++ b/meta-oe/recipes-support/ssiapi/ssiapi_1.3.0.bb
@@ -22,10 +22,9 @@ SRC_URI = "http://sourceforge.net/projects/irstessi/files/${BPN}.${PV}.tgz \
22 file://0004-include-limits.h.patch \ 22 file://0004-include-limits.h.patch \
23 file://0001-Include-libgen.h.patch \ 23 file://0001-Include-libgen.h.patch \
24 " 24 "
25SRC_URI[md5sum] = "d06c9b426437a7697d77266e9835b520"
26SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a" 25SRC_URI[sha256sum] = "59daab29363d6e9f07c524029c4239653cfbbee6b0e57fd75df62499728dad8a"
27 26
28S ="${WORKDIR}/${BPN}.${PV}" 27S = "${UNPACKDIR}/${BPN}.${PV}"
29 28
30inherit autotools 29inherit autotools
31 30
diff --git a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
index 17f54dcf4c..bba2507e14 100644
--- a/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
+++ b/meta-oe/recipes-support/switchtec-user/switchtec-user_4.2.bb
@@ -10,7 +10,6 @@ SRCREV = "e7c351c6c722336b3c79b79cd002c7c2986eefb0"
10SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master" 10SRC_URI = "git://github.com/Microsemi/switchtec-user.git;protocol=https;branch=master"
11SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f" 11SRC_URI[sha256sum] = "a715e46d8498418dbb8a2519318ba0714ee148151d7e4a7fa5e27770a2f6888f"
12 12
13S = "${WORKDIR}/git"
14 13
15inherit autotools-brokensep pkgconfig 14inherit autotools-brokensep pkgconfig
16 15
diff --git a/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch b/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch
new file mode 100644
index 0000000000..4ad2a45275
--- /dev/null
+++ b/meta-oe/recipes-support/synergy/synergy/CVE-2020-15117.patch
@@ -0,0 +1,48 @@
1From 79efdb7c617b809e1a2daf17441d7a30f7046aa5 Mon Sep 17 00:00:00 2001
2From: Jnewbon <48688400+Jnewbon@users.noreply.github.com>
3Date: Tue, 14 Jul 2020 13:14:40 +0100
4Subject: [PATCH] Merge pull request from GHSA-chfm-333q-gfpp
5
6Attempts to fis DoS to servers with less then 4GB memory
7
8CVE: CVE-2020-15117
9Upstream-Status: Backport [https://github.com/deskflow/deskflow/commit/0a97c2be0da2d0df25cb86dfd642429e7a8bea39]
10Signed-off-by: Peter Marko <peter.marko@siemens.com>
11---
12 src/lib/synergy/ProtocolUtil.cpp | 13 ++++++++++++-
13 1 file changed, 12 insertions(+), 1 deletion(-)
14
15diff --git a/src/lib/synergy/ProtocolUtil.cpp b/src/lib/synergy/ProtocolUtil.cpp
16index d9f5dc324..7d2c37ff8 100644
17--- a/src/lib/synergy/ProtocolUtil.cpp
18+++ b/src/lib/synergy/ProtocolUtil.cpp
19@@ -61,6 +61,9 @@ ProtocolUtil::readf(synergy::IStream* stream, const char* fmt, ...)
20 catch (XIO&) {
21 result = false;
22 }
23+ catch (std::bad_alloc & exception) {
24+ result = false;
25+ }
26 va_end(args);
27 return result;
28 }
29@@ -216,7 +219,15 @@ ProtocolUtil::vreadf(synergy::IStream* stream, const char* fmt, va_list args)
30 // allocate a buffer to read the data
31 UInt8* sBuffer = buffer;
32 if (!useFixed) {
33- sBuffer = new UInt8[len];
34+ try{
35+ sBuffer = new UInt8[len];
36+ }
37+ catch (std::bad_alloc & exception) {
38+ // Added try catch due to GHSA-chfm-333q-gfpp
39+ LOG((CLOG_ERR "ALLOC: Unable to allocate memory %d bytes", len));
40+ LOG((CLOG_DEBUG "bad_alloc detected: Do you have enough free memory?"));
41+ throw exception;
42+ }
43 }
44
45 // read the data
46--
472.30.2
48
diff --git a/meta-oe/recipes-support/synergy/synergy_git.bb b/meta-oe/recipes-support/synergy/synergy_git.bb
index fb767942fe..e215c62620 100644
--- a/meta-oe/recipes-support/synergy/synergy_git.bb
+++ b/meta-oe/recipes-support/synergy/synergy_git.bb
@@ -10,12 +10,12 @@ DEPENDS = "virtual/libx11 libxtst libxinerama curl openssl"
10REQUIRED_DISTRO_FEATURES = "x11" 10REQUIRED_DISTRO_FEATURES = "x11"
11 11
12SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1" 12SRC_URI = "git://github.com/symless/synergy-core;protocol=https;nobranch=1"
13SRC_URI += "file://CVE-2020-15117.patch"
13 14
14# Version 1.10.1-stable 15# Version 1.10.1-stable
15SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f" 16SRCREV ?= "1b4c076127687aceac931d269e898beaac1cad9f"
16PV = "1.10.1+git" 17PV = "1.10.1+git"
17 18
18S = "${WORKDIR}/git"
19 19
20inherit cmake features_check 20inherit cmake features_check
21 21
diff --git a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
deleted file mode 100644
index f21ad5d70f..0000000000
--- a/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001
2From: Peter Marko <peter.marko@siemens.com>
3Date: Thu, 4 Apr 2024 15:44:18 +0200
4Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6
5
6With ipv6 disabled, there are linking errors currently.
7This fixes it by not using the symbols when IPv6 is disabled.
8
9Solves #4810 with my config options
10https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
11
12Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880]
13
14Signed-off-by: Peter Marko <peter.marko@siemens.com>
15---
16 lib/template/macros.c | 2 ++
17 1 file changed, 2 insertions(+)
18
19diff --git a/lib/template/macros.c b/lib/template/macros.c
20index 54142706c..fcb83637f 100644
21--- a/lib/template/macros.c
22+++ b/lib/template/macros.c
23@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg)
24 return 0;
25 if (g_sockaddr_inet_check(msg->saddr))
26 return 4;
27+#if SYSLOG_NG_ENABLE_IPV6
28 if (g_sockaddr_inet6_check(msg->saddr))
29 {
30 if (g_sockaddr_inet6_is_v4_mapped(msg->saddr))
31 return 4;
32 return 6;
33 }
34+#endif
35 return 0;
36 }
37
38--
392.30.2
40
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
index 851bf252b7..d3f3730105 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.systemd
@@ -1,5 +1,6 @@
1@version: 3.36 1@version: 4.8
2# 2@include "scl.conf"
3
3# Syslog-ng configuration file, compatible with default Debian syslogd 4# Syslog-ng configuration file, compatible with default Debian syslogd
4# installation. Originally written by anonymous (I can't find his name) 5# installation. Originally written by anonymous (I can't find his name)
5# Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>) 6# Revised, and rewrited by me (SZALAY Attila <sasa@debian.org>)
@@ -10,9 +11,9 @@
10# Joe Slater <joe.slater@windriver.com> 11# Joe Slater <joe.slater@windriver.com>
11 12
12# First, set some global options. 13# First, set some global options.
13options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); 14options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
14 owner("root"); group("adm"); perm(0640); stats_freq(0); 15 dns_cache(no); owner("root"); group("adm"); perm(0640);
15 bad_hostname("^gconfd$"); 16 stats(freq(0)); bad_hostname("^gconfd$");
16}; 17};
17 18
18######################## 19########################
diff --git a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
index 70afd0da84..2b18dce89c 100644
--- a/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
+++ b/meta-oe/recipes-support/syslog-ng/files/syslog-ng.conf.sysvinit
@@ -1,4 +1,4 @@
1@version: 3.36 1@version: 4.8
2# 2#
3# Syslog-ng configuration file, compatible with default Debian syslogd 3# Syslog-ng configuration file, compatible with default Debian syslogd
4# installation. Originally written by anonymous (I can't find his name) 4# installation. Originally written by anonymous (I can't find his name)
@@ -10,9 +10,9 @@
10# Joe Slater <joe.slater@windriver.com> 10# Joe Slater <joe.slater@windriver.com>
11 11
12# First, set some global options. 12# First, set some global options.
13options { chain_hostnames(off); flush_lines(0); use_dns(no); dns_cache(no); use_fqdn(no); 13options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no);
14 owner("root"); group("adm"); perm(0640); stats_freq(0); 14 dns_cache(no); owner("root"); group("adm"); perm(0640);
15 bad_hostname("^gconfd$"); 15 stats(freq(0)); bad_hostname("^gconfd$");
16}; 16};
17 17
18######################## 18########################
diff --git a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.2.bb
index ab4a8d1825..1b46d66d6c 100644
--- a/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb
+++ b/meta-oe/recipes-support/syslog-ng/syslog-ng_4.8.2.bb
@@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only"
13LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" 13LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec"
14 14
15# util-linux added to get libuuid 15# util-linux added to get libuuid
16DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" 16DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c"
17 17
18SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ 18SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \
19 file://syslog-ng.conf.systemd \ 19 file://syslog-ng.conf.systemd \
@@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta
23 file://syslog-ng-tmp.conf \ 23 file://syslog-ng-tmp.conf \
24 file://syslog-ng.service-the-syslog-ng-service.patch \ 24 file://syslog-ng.service-the-syslog-ng-service.patch \
25 file://0001-Fix-buildpaths-warning.patch \ 25 file://0001-Fix-buildpaths-warning.patch \
26 file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \
27" 26"
28SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" 27SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch"
29 28
30SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" 29SRC_URI[sha256sum] = "7d1ebe70746009dc06bd2fa5c412a1985579a9c887292f766cc775d169d60e68"
31 30
32UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" 31UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases"
33 32
@@ -60,19 +59,12 @@ PACKAGECONFIG[dbi] = "--enable-sql,--disable-sql,libdbi,"
60PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet," 59PACKAGECONFIG[spoof-source] = "--enable-spoof-source --with-libnet=${STAGING_BINDIR_CROSS},--disable-spoof-source,libnet,"
61PACKAGECONFIG[http] = "--enable-http,--disable-http,curl," 60PACKAGECONFIG[http] = "--enable-http,--disable-http,curl,"
62PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp," 61PACKAGECONFIG[smtp] = "--enable-smtp --with-libesmtp=${STAGING_LIBDIR},--disable-smtp,libesmtp,"
62PACKAGECONFIG[stomp] = "--enable-stomp,--disable-stomp,,"
63PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c," 63PACKAGECONFIG[json] = "--enable-json,--disable-json,json-c,"
64PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers," 64PACKAGECONFIG[tcp-wrapper] = "--enable-tcp-wrapper,--disable-tcp-wrapper,tcp-wrappers,"
65PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip," 65PACKAGECONFIG[geoip] = "--enable-geoip,--disable-geoip,geoip,"
66PACKAGECONFIG[native] = "--enable-native,--disable-native,," 66PACKAGECONFIG[native] = "--enable-native,--disable-native,,"
67 67PACKAGECONFIG[examples] = "--enable-example-modules,--disable-example-modules,,"
68do_configure:prepend() {
69 olddir=$(pwd)
70 cd ${AUTOTOOLS_SCRIPT_PATH}
71
72 ACLOCAL="$ACLOCAL" autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} -I ${S}/m4 ${ACLOCALEXTRAPATH} || die "extra autoreconf execution failed."
73
74 cd $olddir
75}
76 68
77do_install:append() { 69do_install:append() {
78 install -d ${D}${sysconfdir}/${BPN} 70 install -d ${D}${sysconfdir}/${BPN}
diff --git a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb b/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
deleted file mode 100644
index db4c395c56..0000000000
--- a/meta-oe/recipes-support/system-config-keyboard/system-config-keyboard_1.4.0.bb
+++ /dev/null
@@ -1,28 +0,0 @@
1DESCRIPTION = "a graphical user interface that allows the user to \
2change the default keyboard of the system"
3LICENSE = "GPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5SRC_URI = "https://fedorahosted.org/releases/s/y/${BPN}/${BP}.tar.bz2"
6SRC_URI[md5sum] = "c267db0ee7a2131ba418399dc17f9e72"
7SRC_URI[sha256sum] = "218c883e4e2bfcc82bfe07e785707b5c2ece28df772f2155fd044b9bb1614284"
8
9inherit python3-dir gettext
10DEPENDS += "intltool-native gettext-native"
11
12EXTRA_OEMAKE = " \
13 PYTHON='${STAGING_BINDIR_NATIVE}'/python-native/python \
14 PYTHON_SITELIB=${PYTHON_SITEPACKAGES_DIR} \
15"
16do_install() {
17 oe_runmake 'DESTDIR=${D}' install
18}
19
20do_install:append:class-native() {
21 rm -rf ${D}/usr
22}
23
24FILES:${PN} += " \
25 ${libdir}/python${PYTHON_BASEVERSION}/* \
26 ${datadir}/* \
27"
28BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb
new file mode 100644
index 0000000000..019098fdf7
--- /dev/null
+++ b/meta-oe/recipes-support/systemd-netlogd/systemd-netlogd_1.4.4.bb
@@ -0,0 +1,27 @@
1SUMMARY = "Forwards messages from the journal to other hosts over the network using the Syslog Protocol"
2
3LICENSE = "LGPL-2.1-or-later"
4LIC_FILES_CHKSUM = "file://LICENSE.LGPL2.1;md5=4fbd65380cdd255951079008b364516c"
5
6SRC_URI = "git://github.com/systemd/systemd-netlogd.git;protocol=https;branch=main"
7SRCREV = "b03cc3b1a75048c7cf19467d8918a4b7320767e6"
8
9inherit meson systemd pkgconfig useradd features_check
10
11REQUIRED_DISTRO_FEATURES = "systemd"
12COMPATIBLE_HOST:libc-musl = "null"
13
14
15DEPENDS += "systemd"
16DEPENDS += "openssl"
17DEPENDS += "gperf-native"
18DEPENDS += "python3-sphinx-native"
19
20# systemd-netlogd uses prefix and sysconfdir in a weird way.
21EXTRA_OEMESON += "--prefix ${libdir}/systemd --sysconfdir ${sysconfdir}/systemd"
22
23FILES:${PN} += "${libdir}"
24
25USERADD_PACKAGES = "${PN}"
26GROUPADD_PARAM:${PN} = "-r systemd-journal"
27USERADD_PARAM:${PN} = "--system -d / -M --shell /sbin/nologin -g systemd-journal systemd-journal-netlog"
diff --git a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
deleted file mode 100644
index 640b131703..0000000000
--- a/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001
2From: Naveen Saini <naveen.kumar.saini@intel.com>
3Date: Wed, 29 Nov 2023 15:48:57 +0800
4Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check
5
6This check is preventing pkgconfig to
7search for hwloc under cross-compilation.
8
9pkgconfig able to find hwloc pkg from sysroot.
10
11Upstream-Status: Inappropriate
12
13Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
14---
15 cmake/hwloc_detection.cmake | 2 --
16 1 file changed, 2 deletions(-)
17
18diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake
19index 47233b17..5a7e84c3 100644
20--- a/cmake/hwloc_detection.cmake
21+++ b/cmake/hwloc_detection.cmake
22@@ -46,8 +46,6 @@ endforeach()
23 unset(HWLOC_TARGET_NAME)
24
25 if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND
26- # No hwloc auto detection for cross compilation
27- NOT CMAKE_CROSSCOMPILING AND
28 NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH
29 )
30 find_package(PkgConfig QUIET)
31--
322.37.3
33
diff --git a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
index f834726bd6..937cf6a0b9 100644
--- a/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb
+++ b/meta-oe/recipes-support/tbb/tbb_2022.1.0.bb
@@ -12,12 +12,11 @@ DEPENDS:append:class-target = " hwloc"
12 12
13PE = "1" 13PE = "1"
14 14
15BRANCH = "onetbb_2021" 15BRANCH = "onetbb_2022"
16SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" 16SRCREV = "45587e94dfb6dfe00220c5f520020a5bc745e92f"
17SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ 17SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \
18 file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ 18 "
19" 19
20S = "${WORKDIR}/git"
21 20
22inherit cmake pkgconfig 21inherit cmake pkgconfig
23 22
@@ -25,6 +24,8 @@ inherit cmake pkgconfig
25EXTRA_OECMAKE += " \ 24EXTRA_OECMAKE += " \
26 -DTBB_TEST=OFF \ 25 -DTBB_TEST=OFF \
27 -DCMAKE_BUILD_TYPE=Release \ 26 -DCMAKE_BUILD_TYPE=Release \
27 -DTBB_STRICT=OFF \
28 -DTBB_DISABLE_HWLOC_AUTOMATIC_SEARCH=OFF \
28 " 29 "
29 30
30# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi) 31# Hard-float 'd' ABI can't be used for a target that doesn't support the D instruction set extension (ignoring target-abi)
diff --git a/meta-oe/recipes-support/testdisk/testdisk_7.2.bb b/meta-oe/recipes-support/testdisk/testdisk_7.2.bb
new file mode 100644
index 0000000000..66d0cd4d0d
--- /dev/null
+++ b/meta-oe/recipes-support/testdisk/testdisk_7.2.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "TestDisk is a free data recovery software primarily designed to help recover lost partitions and/or make non-booting disks bootable again when these symptoms are caused by faulty software, certain types of viruses or human error (such as accidentally deleting your Partition Table)."
2LICENSE = "GPL-2.0-or-later"
3LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
4
5DEPENDS = "jpeg ncurses e2fsprogs"
6
7SRC_URI = "https://www.cgsecurity.org/${BP}.tar.bz2"
8SRC_URI[sha256sum] = "f8343be20cb4001c5d91a2e3bcd918398f00ae6d8310894a5a9f2feb813c283f"
9
10inherit autotools pkgconfig
11COMPATIBLE_HOST:libc-musl = "null"
12
13PACKAGES =+ "${PN}-photorec"
14
15DESCRIPTION:${PN}-photorec = "Photorec is file data recovery software designed to recover lost files including video, documents and archives from Hard Disks and CDRom and lost pictures (Photo Recovery) from digital camera memory."
16FILES:${PN}-photorec = "${sbindir}/photorec"
17
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
deleted file mode 100644
index d71aa442fa..0000000000
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc
+++ /dev/null
@@ -1,214 +0,0 @@
1# Autogenerated with 'bitbake -c update_crates thin-provisioning-tools'
2
3# from Cargo.lock
4SRC_URI += " \
5 crate://crates.io/adler/1.0.2 \
6 crate://crates.io/aho-corasick/1.1.2 \
7 crate://crates.io/anstyle/1.0.6 \
8 crate://crates.io/anyhow/1.0.80 \
9 crate://crates.io/atty/0.2.14 \
10 crate://crates.io/autocfg/1.1.0 \
11 crate://crates.io/base64/0.21.7 \
12 crate://crates.io/bitflags/1.3.2 \
13 crate://crates.io/bitflags/2.4.2 \
14 crate://crates.io/bytemuck/1.14.3 \
15 crate://crates.io/byteorder/1.5.0 \
16 crate://crates.io/cassowary/0.3.0 \
17 crate://crates.io/cfg-if/1.0.0 \
18 crate://crates.io/clap/4.5.1 \
19 crate://crates.io/clap_builder/4.5.1 \
20 crate://crates.io/clap_lex/0.7.0 \
21 crate://crates.io/console/0.15.8 \
22 crate://crates.io/crc32c/0.6.5 \
23 crate://crates.io/crc32fast/1.4.0 \
24 crate://crates.io/data-encoding/2.5.0 \
25 crate://crates.io/downcast/0.11.0 \
26 crate://crates.io/duct/0.13.7 \
27 crate://crates.io/encode_unicode/0.3.6 \
28 crate://crates.io/env_logger/0.8.4 \
29 crate://crates.io/errno/0.3.8 \
30 crate://crates.io/exitcode/1.1.2 \
31 crate://crates.io/fastrand/2.0.1 \
32 crate://crates.io/fixedbitset/0.4.2 \
33 crate://crates.io/flate2/1.0.28 \
34 crate://crates.io/fragile/2.0.0 \
35 crate://crates.io/getrandom/0.2.12 \
36 crate://crates.io/hermit-abi/0.1.19 \
37 crate://crates.io/hermit-abi/0.3.6 \
38 crate://crates.io/indicatif/0.17.8 \
39 crate://crates.io/instant/0.1.12 \
40 crate://crates.io/iovec/0.1.4 \
41 crate://crates.io/lazy_static/1.4.0 \
42 crate://crates.io/libc/0.2.153 \
43 crate://crates.io/linux-raw-sys/0.4.13 \
44 crate://crates.io/log/0.4.20 \
45 crate://crates.io/memchr/2.7.1 \
46 crate://crates.io/minimal-lexical/0.2.1 \
47 crate://crates.io/miniz_oxide/0.7.2 \
48 crate://crates.io/mockall/0.12.1 \
49 crate://crates.io/mockall_derive/0.12.1 \
50 crate://crates.io/nom/7.1.3 \
51 crate://crates.io/num-derive/0.4.2 \
52 crate://crates.io/num-traits/0.2.18 \
53 crate://crates.io/num_cpus/1.16.0 \
54 crate://crates.io/number_prefix/0.4.0 \
55 crate://crates.io/numtoa/0.1.0 \
56 crate://crates.io/once_cell/1.19.0 \
57 crate://crates.io/os_pipe/1.1.5 \
58 crate://crates.io/portable-atomic/1.6.0 \
59 crate://crates.io/ppv-lite86/0.2.17 \
60 crate://crates.io/predicates/3.1.0 \
61 crate://crates.io/predicates-core/1.0.6 \
62 crate://crates.io/predicates-tree/1.0.9 \
63 crate://crates.io/proc-macro2/1.0.78 \
64 crate://crates.io/quick-xml/0.31.0 \
65 crate://crates.io/quickcheck/1.0.3 \
66 crate://crates.io/quickcheck_macros/1.0.0 \
67 crate://crates.io/quote/1.0.35 \
68 crate://crates.io/rand/0.8.5 \
69 crate://crates.io/rand_chacha/0.3.1 \
70 crate://crates.io/rand_core/0.6.4 \
71 crate://crates.io/rangemap/1.5.0 \
72 crate://crates.io/redox_syscall/0.2.16 \
73 crate://crates.io/redox_termios/0.1.3 \
74 crate://crates.io/regex/1.10.3 \
75 crate://crates.io/regex-automata/0.4.5 \
76 crate://crates.io/regex-syntax/0.8.2 \
77 crate://crates.io/roaring/0.10.3 \
78 crate://crates.io/rustc_version/0.4.0 \
79 crate://crates.io/rustix/0.38.31 \
80 crate://crates.io/safemem/0.3.3 \
81 crate://crates.io/semver/1.0.22 \
82 crate://crates.io/shared_child/1.0.0 \
83 crate://crates.io/strsim/0.11.0 \
84 crate://crates.io/syn/1.0.109 \
85 crate://crates.io/syn/2.0.50 \
86 crate://crates.io/tempfile/3.10.0 \
87 crate://crates.io/termion/1.5.6 \
88 crate://crates.io/termtree/0.4.1 \
89 crate://crates.io/thiserror/1.0.57 \
90 crate://crates.io/thiserror-impl/1.0.57 \
91 crate://crates.io/threadpool/1.8.1 \
92 crate://crates.io/tui/0.19.0 \
93 crate://crates.io/unicode-ident/1.0.12 \
94 crate://crates.io/unicode-segmentation/1.11.0 \
95 crate://crates.io/unicode-width/0.1.11 \
96 crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \
97 crate://crates.io/winapi/0.3.9 \
98 crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \
99 crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \
100 crate://crates.io/windows-sys/0.52.0 \
101 crate://crates.io/windows-targets/0.52.3 \
102 crate://crates.io/windows_aarch64_gnullvm/0.52.3 \
103 crate://crates.io/windows_aarch64_msvc/0.52.3 \
104 crate://crates.io/windows_i686_gnu/0.52.3 \
105 crate://crates.io/windows_i686_msvc/0.52.3 \
106 crate://crates.io/windows_x86_64_gnu/0.52.3 \
107 crate://crates.io/windows_x86_64_gnullvm/0.52.3 \
108 crate://crates.io/windows_x86_64_msvc/0.52.3 \
109"
110
111SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
112SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
113SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
114SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
115SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
116SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
117SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
118SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
119SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
120SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
121SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
122SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
123SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
124SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da"
125SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb"
126SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
127SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
128SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2"
129SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
130SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
131SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1"
132SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c"
133SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
134SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
135SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
136SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193"
137SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
138SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
139SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
140SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
141SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
142SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
143SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd"
144SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
145SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
146SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
147SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
148SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
149SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
150SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
151SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
152SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
153SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
154SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
155SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
156SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
157SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
158SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
159SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
160SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
161SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
162SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
163SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9"
164SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
165SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
166SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8"
167SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
168SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
169SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
170SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
171SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6"
172SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9"
173SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
174SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
175SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
176SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
177SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2"
178SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
179SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb"
180SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
181SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd"
182SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
183SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf"
184SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
185SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
186SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
187SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
188SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef"
189SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01"
190SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
191SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb"
192SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67"
193SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e"
194SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
195SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
196SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
197SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa"
198SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1"
199SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
200SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
201SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
202SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
203SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
204SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
205SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
206SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
207SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f"
208SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6"
209SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f"
210SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb"
211SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58"
212SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614"
213SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c"
214SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6"
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc
deleted file mode 100644
index ceea67c364..0000000000
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-git-crates.inc
+++ /dev/null
@@ -1,6 +0,0 @@
1SRC_URI += "\
2 git://github.com/jthornber/rio;protocol=https;nobranch=1;name=rio;destsuffix=rio;type=git-dependency \
3"
4
5SRCREV_FORMAT .= "_rio"
6SRCREV_rio = "2979a720f671e836302c01546f9cc9f7988610c8"
diff --git a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb
deleted file mode 100644
index 09b91f6b37..0000000000
--- a/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb
+++ /dev/null
@@ -1,50 +0,0 @@
1SUMMARY = "Tools of dm-thin device-mapper"
2DESCRIPTION = "A suite of tools for manipulating the metadata of the dm-thin device-mapper target."
3HOMEPAGE = "https://github.com/jthornber/thin-provisioning-tools"
4LICENSE = "GPL-3.0-only"
5SECTION = "devel"
6
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
8S = "${WORKDIR}/git"
9
10SRC_URI = " \
11 git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \
12 "
13
14SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092"
15UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)"
16
17inherit cargo cargo-update-recipe-crates
18
19require ${BPN}-crates.inc
20require ${BPN}-git-crates.inc
21
22do_install:append() {
23 install -d ${D}${sbindir}
24 mv ${D}${bindir}/pdata_tools ${D}${sbindir}/pdata_tools
25 rmdir --ignore-fail-on-non-empty ${D}${bindir}
26
27 for tool in cache_check \
28 cache_dump \
29 cache_metadata_size \
30 cache_repair \
31 cache_restore \
32 cache_writeback \
33 thin_check \
34 thin_delta \
35 thin_dump \
36 thin_ls \
37 thin_repair \
38 thin_restore \
39 thin_rmap \
40 thin_metadata_size \
41 thin_metadata_pack \
42 thin_metadata_unpack \
43 thin_trim \
44 era_check \
45 era_dump \
46 era_invalidate \
47 era_restore; do
48 ln -sf pdata_tools ${D}${sbindir}/$tool
49 done
50}
diff --git a/meta-oe/recipes-support/tio/tio_2.7.bb b/meta-oe/recipes-support/tio/tio_3.9.bb
index 59c772b5d0..67107e2924 100644
--- a/meta-oe/recipes-support/tio/tio_2.7.bb
+++ b/meta-oe/recipes-support/tio/tio_3.9.bb
@@ -2,18 +2,16 @@ SUMMARY = "tio - a simple serial device I/O tool"
2DESCRIPTION = "tio is a simple serial device tool which features a \ 2DESCRIPTION = "tio is a simple serial device tool which features a \
3 straightforward command-line and configuration file interface to easily \ 3 straightforward command-line and configuration file interface to easily \
4 connect to serial TTY devices for basic I/O operations." 4 connect to serial TTY devices for basic I/O operations."
5
6LICENSE = "GPL-2.0-or-later" 5LICENSE = "GPL-2.0-or-later"
7LIC_FILES_CHKSUM = "file://LICENSE;md5=0e1a95b7892d3015ecd6d0016f601f2c" 6LIC_FILES_CHKSUM = "file://LICENSE;md5=d25b0ab86d83b943da4d25251a2c21d7"
7DEPENDS += " glib-2.0 lua"
8SRCREV = "bdfe87e1cbf6e3bfd48324a25ea026fcd3cc47e9"
8 9
9SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master" 10SRC_URI = "git://github.com/tio/tio;protocol=https;branch=master;tag=v${PV}"
10SRCREV = "1c32555c2a4f26b60f94757656825fc6684d6892"
11 11
12S = "${WORKDIR}/git"
13 12
14inherit meson pkgconfig 13inherit meson pkgconfig
15 14
16DEPENDS += " libinih" 15RDEPENDS:${PN} += " lua"
17RDEPENDS:${PN} += " libinih"
18 16
19FILES:${PN} += " /usr/share/bash-completion/completions/tio " 17FILES:${PN} += " ${datadir}/bash-completion/completions/tio"
diff --git a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
index ae00ff4e55..75f68ab5f5 100644
--- a/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
+++ b/meta-oe/recipes-support/tokyocabinet/tokyocabinet_1.4.48.bb
@@ -20,7 +20,6 @@ SRC_URI = "http://fallabs.com/tokyocabinet/${BP}.tar.gz \
20 file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \ 20 file://0001-configure-Fix-check-functions-for-AC_CHECK_LIB-test.patch \
21" 21"
22 22
23SRC_URI[md5sum] = "fd03df6965f8f56dd5b8518ca43b4f5e"
24SRC_URI[sha256sum] = "a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90" 23SRC_URI[sha256sum] = "a003f47c39a91e22d76bc4fe68b9b3de0f38851b160bbb1ca07a4f6441de1f90"
25 24
26DEPENDS = "bzip2 zlib" 25DEPENDS = "bzip2 zlib"
diff --git a/meta-oe/recipes-support/tree/tree_2.1.1.bb b/meta-oe/recipes-support/tree/tree_2.2.1.bb
index 0b61149609..df52d63fbb 100644
--- a/meta-oe/recipes-support/tree/tree_2.1.1.bb
+++ b/meta-oe/recipes-support/tree/tree_2.2.1.bb
@@ -1,11 +1,11 @@
1SUMMARY = "A recursive directory listing command" 1SUMMARY = "A recursive directory listing command"
2HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" 2HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree"
3SECTION = "console/utils" 3SECTION = "console/utils"
4LICENSE = "GPL-2.0-only" 4LICENSE = "GPL-2.0-only"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" 5LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833"
6 6
7SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" 7SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz"
8SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" 8SRC_URI[sha256sum] = "68ac45dc78c0c311ada06200ffc3c285e74223ba208061f8d15ffac25e44b2ec"
9 9
10# tree's default CFLAGS for Linux 10# tree's default CFLAGS for Linux
11CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" 11CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64"
diff --git a/meta-oe/recipes-support/udisks/udisks2/CVE-2025-6019.patch b/meta-oe/recipes-support/udisks/udisks2/CVE-2025-6019.patch
new file mode 100644
index 0000000000..2e94c8497f
--- /dev/null
+++ b/meta-oe/recipes-support/udisks/udisks2/CVE-2025-6019.patch
@@ -0,0 +1,51 @@
1From d0d04a381036b79df91616552706d515639bb762 Mon Sep 17 00:00:00 2001
2From: Tomas Bzatek <tbzatek@redhat.com>
3Date: Wed, 4 Jun 2025 15:26:46 +0200
4Subject: [PATCH] udiskslinuxfilesystemhelpers: Mount private mounts with
5 'nodev,nosuid'
6
7The private mount done in take_filesystem_ownership() should always
8default to 'nodev,nosuid' for security and 'errors=remount-ro' for
9selected filesystem types to handle an corrupted filesystem. This is
10consistent with mount options calculation for regular mounts.
11
12CVE: CVE-2025-6019
13Upstream-Status: Backport [ https://github.com/storaged-project/udisks/commit/5e7277debea926370e587408517560afe87d28c9 ]
14
15Signed-off-by: Changqing Li <changqing.li@windriver.com>
16---
17 src/udiskslinuxfilesystemhelpers.c | 10 +++++++++-
18 1 file changed, 9 insertions(+), 1 deletion(-)
19
20diff --git a/src/udiskslinuxfilesystemhelpers.c b/src/udiskslinuxfilesystemhelpers.c
21index 7c5fc037..9eb7742c 100644
22--- a/src/udiskslinuxfilesystemhelpers.c
23+++ b/src/udiskslinuxfilesystemhelpers.c
24@@ -123,6 +123,7 @@ take_filesystem_ownership (const gchar *device,
25
26 {
27 gchar *mountpoint = NULL;
28+ const gchar *mount_opts;
29 GError *local_error = NULL;
30 gboolean unmount = FALSE;
31 gboolean success = TRUE;
32@@ -151,8 +152,15 @@ take_filesystem_ownership (const gchar *device,
33 goto out;
34 }
35
36+ mount_opts = "nodev,nosuid";
37+ if (g_strcmp0 (fstype, "ext2") == 0 ||
38+ g_strcmp0 (fstype, "ext3") == 0 ||
39+ g_strcmp0 (fstype, "ext4") == 0 ||
40+ g_strcmp0 (fstype, "jfs") == 0)
41+ mount_opts = "nodev,nosuid,errors=remount-ro";
42+
43 /* TODO: mount to a private mount namespace */
44- if (!bd_fs_mount (device, mountpoint, fstype, NULL, NULL, &local_error))
45+ if (!bd_fs_mount (device, mountpoint, fstype, mount_opts, NULL, &local_error))
46 {
47 g_set_error (error, UDISKS_ERROR, UDISKS_ERROR_FAILED,
48 "Cannot mount %s at %s: %s",
49--
502.34.1
51
diff --git a/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
index cb1cbe670d..cc0c19ec8e 100644
--- a/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
+++ b/meta-oe/recipes-support/udisks/udisks2_2.10.1.bb
@@ -20,9 +20,9 @@ RDEPENDS:${PN} = "acl"
20SRC_URI = " \ 20SRC_URI = " \
21 git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ 21 git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \
22 file://0001-Makefile.am-Dont-include-buildpath.patch \ 22 file://0001-Makefile.am-Dont-include-buildpath.patch \
23 file://CVE-2025-6019.patch \
23" 24"
24SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" 25SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350"
25S = "${WORKDIR}/git"
26 26
27CVE_PRODUCT = "udisks" 27CVE_PRODUCT = "udisks"
28 28
diff --git a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb
index 8b334dbdec..f4c2eaa63f 100644
--- a/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb
+++ b/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb
@@ -6,9 +6,10 @@ DEPENDS = "libusb1"
6LICENSE = "GPL-2.0-only" 6LICENSE = "GPL-2.0-only"
7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 7LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
8 8
9SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e" 9SRCREV = "352f5878e999c0a9d5a453b34110479b2056d7e7"
10SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" 10SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https"
11S = "${WORKDIR}/git" 11
12inherit pkgconfig
12 13
13# uhubctl gets its program version from "git describe". As we use the source 14# uhubctl gets its program version from "git describe". As we use the source
14# archive do reduce download size replace the call with our hardcoded version. 15# archive do reduce download size replace the call with our hardcoded version.
diff --git a/meta-oe/recipes-support/uim/uim_1.8.9.bb b/meta-oe/recipes-support/uim/uim_1.9.0.bb
index f78c82f18a..cb3aee3f0d 100644
--- a/meta-oe/recipes-support/uim/uim_1.8.9.bb
+++ b/meta-oe/recipes-support/uim/uim_1.9.0.bb
@@ -8,9 +8,10 @@ SRC_URI = "https://github.com/uim/uim/releases/download/${PV}/uim-${PV}.tar.bz2"
8SRC_URI:append:class-target = "\ 8SRC_URI:append:class-target = "\
9 file://uim-module-manager.patch \ 9 file://uim-module-manager.patch \
10" 10"
11SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" 11SRC_URI[sha256sum] = "271f0ed5f455e5bffa859f01b2d0f7fb966554ebd4822657afb67a0431dd85a8"
12 12
13UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" 13UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases"
14UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)"
14 15
15DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" 16DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit"
16DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" 17DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native"
@@ -30,6 +31,8 @@ REQUIRED_DISTRO_FEATURES = "x11"
30 31
31GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3" 32GTKIMMODULES_PACKAGES = "uim-gtk2.0 uim-gtk3"
32 33
34CFLAGS += "-std=gnu17"
35
33EXTRA_OECONF += "--disable-emacs \ 36EXTRA_OECONF += "--disable-emacs \
34 --with-libedit=${STAGING_EXECPREFIXDIR} \ 37 --with-libedit=${STAGING_EXECPREFIXDIR} \
35 --without-scim \ 38 --without-scim \
diff --git a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
index 026d4ffe02..890568d727 100644
--- a/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
+++ b/meta-oe/recipes-support/unicode-ucd/unicode-ucd_14.0.0.bb
@@ -1,19 +1,18 @@
1SUMMARY = "Unicode Character Database" 1SUMMARY = "Unicode Character Database"
2HOMEPAGE = "https://unicode.org/ucd/" 2HOMEPAGE = "https://unicode.org/ucd/"
3LICENSE = "MIT" 3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://${UNPACKDIR}/license.txt;md5=4b11b5cbb0a24df9f4e7db63db98f22f" 4LIC_FILES_CHKSUM = "file://${UNPACKDIR}/ucd-license-v3.txt;md5=ea17640caddb659394df50e5db6efd69"
5 5
6SRC_URI = " \ 6SRC_URI = " \
7 https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \ 7 https://www.unicode.org/Public/zipped/${PV}/UCD.zip;name=ucd;subdir=ucd;downloadfilename=unicode-ucd-${PV}.zip \
8 https://www.unicode.org/license.txt;name=ucd-license \ 8 https://www.unicode.org/license.txt;downloadfilename=ucd-license-v3.txt;name=ucd-license \
9" 9"
10SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600" 10SRC_URI[ucd.sha256sum] = "033a5276b5d7af8844589f8e3482f3977a8385e71d107d375055465178c23600"
11SRC_URI[ucd-license.sha256sum] = "f7830d126f59d83842565d3dddedc79db4ca978ed52aee0ebcc040ea76a85519" 11SRC_URI[ucd-license.sha256sum] = "abf84f74dea2812799e1dbef7f0581adf7db244881e4febb8684f441568da0ad"
12 12
13inherit allarch 13inherit allarch
14 14
15S = "${WORKDIR}/sources" 15S = "${UNPACKDIR}"
16UNPACKDIR = "${S}"
17 16
18do_configure[noexec] = "1" 17do_configure[noexec] = "1"
19 18
diff --git a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
index dfad833e0a..389c3be903 100644
--- a/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
+++ b/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb
@@ -15,11 +15,12 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \
15" 15"
16SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" 16SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec"
17 17
18UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html"
18UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" 19UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar"
19 20
20inherit autotools-brokensep multilib_header qemu 21inherit autotools-brokensep multilib_header qemu
21 22
22S = "${WORKDIR}/unixODBC-${PV}" 23S = "${UNPACKDIR}/unixODBC-${PV}"
23 24
24EXTRA_OEMAKE += "LIBS=-lltdl" 25EXTRA_OEMAKE += "LIBS=-lltdl"
25EXTRA_OECONF += "--enable-utf8ini" 26EXTRA_OECONF += "--enable-utf8ini"
diff --git a/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb b/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb
new file mode 100644
index 0000000000..f9f7e86990
--- /dev/null
+++ b/meta-oe/recipes-support/upower/power-profiles-daemon_0.30.bb
@@ -0,0 +1,28 @@
1SUMMARY = "Makes power profiles handling available over D-Bus"
2HOMEPAGE = "https://gitlab.freedesktop.org/upower/power-profile-daemon"
3LICENSE = "GPL-3.0-only"
4LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
5
6DEPENDS = " \
7 glib-2.0 \
8 polkit \
9 upower \
10 libgudev \
11"
12
13inherit meson pkgconfig systemd features_check
14
15REQUIRED_DISTRO_FEATURES = "polkit"
16
17EXTRA_OEMESON = "-Dtests=false"
18
19SRCREV = "5b4994c8a91290481bef87a5bae95391d0ec677f"
20SRC_URI = "git://gitlab.freedesktop.org/upower/power-profiles-daemon;branch=main;protocol=https"
21
22do_install:append() {
23 install -d ${D}${sysconfdir}/tmpfiles.d
24 echo "d ${localstatedir}/lib/power-profiles-daemon 700 root root - -" > ${D}${sysconfdir}/tmpfiles.d/power-profiles-daemon.conf
25 sed -i -e 's|After=multi-user.target |After=|g' ${D}${systemd_system_unitdir}/power-profiles-daemon.service
26}
27
28FILES:${PN} += "${sysconfdir}/tmpfiles.d ${datadir}/dbus-1 ${datadir}/polkit-1 ${systemd_system_unitdir}"
diff --git a/meta-oe/recipes-support/upower/upower_0.99.17.bb b/meta-oe/recipes-support/upower/upower_1.90.6.bb
index 0572cc801b..d2f58d5b22 100644
--- a/meta-oe/recipes-support/upower/upower_0.99.17.bb
+++ b/meta-oe/recipes-support/upower/upower_1.90.6.bb
@@ -11,11 +11,12 @@ DEPENDS = " \
11 dbus-glib \ 11 dbus-glib \
12" 12"
13 13
14SRC_URI = "git://gitlab.freedesktop.org/upower/upower.git;protocol=https;branch=master" 14SRC_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/archive/v${PV}/${BPN}-v${PV}.tar.bz2"
15SRCREV = "c889154ec8e3e2239db9260d48b2e198d72ba002" 15SRC_URI[sha256sum] = "aed4e42a21307512ad236ad58d7ee4e0196670c8524a168a0edccdc32964ea0c"
16S = "${WORKDIR}/git" 16S = "${UNPACKDIR}/${BPN}-v${PV}"
17 17
18UPSTREAM_CHECK_GITTAGREGEX = "UPOWER_(?P<pver>\d+(\_\d+)+)" 18UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/${BPN}/${BPN}/-/tags"
19UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+(\.\d+)+)"
19 20
20GIR_MESON_ENABLE_FLAG = "enabled" 21GIR_MESON_ENABLE_FLAG = "enabled"
21GIR_MESON_DISABLE_FLAG = "disabled" 22GIR_MESON_DISABLE_FLAG = "disabled"
@@ -23,9 +24,10 @@ GTKDOC_MESON_OPTION = "gtk-doc"
23 24
24inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd 25inherit meson pkgconfig gtk-doc gettext gobject-introspection systemd
25 26
26PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" 27PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd polkit', d)}"
27PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist" 28PACKAGECONFIG[idevice] = "-Didevice=enabled,-Didevice=disabled,libimobiledevice libplist"
28PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd" 29PACKAGECONFIG[systemd] = "-Dsystemdsystemunitdir=${systemd_system_unitdir},-Dsystemdsystemunitdir=no -Dudevrulesdir=${base_libdir}/udev/rules.d,systemd"
30PACKAGECONFIG[polkit] = "-Dpolkit=enabled,-Dpolkit=disabled,polkit"
29 31
30EXTRA_OEMESON = " \ 32EXTRA_OEMESON = " \
31 -Dos_backend=linux \ 33 -Dos_backend=linux \
@@ -36,9 +38,16 @@ SYSTEMD_SERVICE:${PN} = "upower.service"
36# don't start on boot by default - dbus does that on demand 38# don't start on boot by default - dbus does that on demand
37SYSTEMD_AUTO_ENABLE = "disable" 39SYSTEMD_AUTO_ENABLE = "disable"
38 40
39RDEPENDS:${PN} += "dbus" 41RDEPENDS:${PN} += "${VIRTUAL-RUNTIME_dbus}"
40RRECOMMENDS:${PN} += "pm-utils" 42RRECOMMENDS:${PN} += "pm-utils"
41FILES:${PN} += " \ 43FILES:${PN} += " \
42 ${datadir}/dbus-1/ \ 44 ${datadir}/dbus-1/ \
45 ${datadir}/polkit-1/ \
43 ${base_libdir}/udev/* \ 46 ${base_libdir}/udev/* \
44" 47"
48
49do_install:append() {
50 # remove integration tests scripts
51 rm -rf ${D}${datadir}/installed-tests
52 rm -rf ${D}${libexecdir}/upower
53}
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
index 351fe44d70..2dfcd886ca 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch-data_20191128.bb
@@ -7,7 +7,6 @@ inherit allarch
7DEPENDS += "tcl-native" 7DEPENDS += "tcl-native"
8 8
9SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" 9SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2"
10SRC_URI[md5sum] = "e8fce7eb949cbe16c61fb71bade4cc17"
11SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9" 10SRC_URI[sha256sum] = "3f039b60791c21c7cb15c7986cac89650f076dc274798fa242231b910785eaf9"
12 11
13do_install() { 12do_install() {
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
new file mode 100644
index 0000000000..eb65beb686
--- /dev/null
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch/0001-Fix-build-with-gcc-15.patch
@@ -0,0 +1,51 @@
1From f497eef1f38bd79a96a13269f251f1413c54b790 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <martin.jansa@gmail.com>
3Date: Tue, 25 Mar 2025 12:36:32 +0100
4Subject: [PATCH] Fix build with gcc-15
5
6* fixes:
7 http://errors.yoctoproject.org/Errors/Details/848747/
8
9usb_modeswitch.c: In function 'main':
10usb_modeswitch.c:573:28: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
11 573 | currentConfigVal = get_current_config_value(dev);
12 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
13In file included from usb_modeswitch.c:59:
14usb_modeswitch.h:55:5: note: declared here
15 55 | int get_current_config_value();
16 | ^~~~~~~~~~~~~~~~~~~~~~~~
17usb_modeswitch.c:775:52: error: too many arguments to function 'get_current_config_value'; expected 0, have 1
18 775 | currentConfigVal = get_current_config_value(dev);
19 | ^~~~~~~~~~~~~~~~~~~~~~~~ ~~~
20usb_modeswitch.h:55:5: note: declared here
21 55 | int get_current_config_value();
22 | ^~~~~~~~~~~~~~~~~~~~~~~~
23
24Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
25Upstream-Status: Submitted [https://www.draisberghof.de/usb_modeswitch/bb/viewtopic.php?t=3122]
26---
27 usb_modeswitch.c | 4 ++--
28 1 file changed, 2 insertions(+), 2 deletions(-)
29
30diff --git a/usb_modeswitch.c b/usb_modeswitch.c
31index 2d4c0aa..bfbcbfb 100644
32--- a/usb_modeswitch.c
33+++ b/usb_modeswitch.c
34@@ -570,7 +570,7 @@ int main(int argc, char **argv)
35 /* Get current configuration of default device, note value if Configuration
36 * parameter is set. Also sets active_config
37 */
38- currentConfigVal = get_current_config_value(dev);
39+ currentConfigVal = get_current_config_value();
40 if (Configuration > -1) {
41 SHOW_PROGRESS(output,"Current configuration number is %d\n", currentConfigVal);
42 } else
43@@ -772,7 +772,7 @@ int main(int argc, char **argv)
44 if (Configuration > 0) {
45 if (currentConfigVal != Configuration) {
46 if (switchConfiguration()) {
47- currentConfigVal = get_current_config_value(dev);
48+ currentConfigVal = get_current_config_value();
49 if (currentConfigVal == Configuration) {
50 SHOW_PROGRESS(output,"The configuration was set successfully\n");
51 } else {
diff --git a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
index cd3840feab..b6b720fe1e 100644
--- a/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
+++ b/meta-oe/recipes-support/usb-modeswitch/usb-modeswitch_2.6.1.bb
@@ -4,7 +4,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=091556bd6d0154cd4c2d17a1bfc7380a"
4 4
5DEPENDS = "libusb1" 5DEPENDS = "libusb1"
6 6
7SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2" 7SRC_URI = "http://www.draisberghof.de/usb_modeswitch/${BP}.tar.bz2 \
8 file://0001-Fix-build-with-gcc-15.patch \
9"
8SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34" 10SRC_URI[sha256sum] = "5195d9e136e52f658f19e9f93e4f982b1b67bffac197d0a455cd8c2cd245fa34"
9 11
10inherit pkgconfig systemd 12inherit pkgconfig systemd
diff --git a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
index b0dd72fb25..aa884419f8 100644
--- a/meta-oe/recipes-support/usbids/usbids_2023.01.16.bb
+++ b/meta-oe/recipes-support/usbids/usbids_2025.04.01.bb
@@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=84dcc94da3adb52b53ae4fa38fe49e5d"
6 6
7SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https" 7SRC_URI = "git://github.com/usbids/usbids.git;branch=master;protocol=https"
8 8
9SRCREV = "7963233faf69eb9c80ffca8dfc1f31940f75999f" 9# April 1, 2025
10SRCREV = "635738b64eb52d376c5d1756c265de67236c8934"
10 11
11S = "${WORKDIR}/git"
12 12
13do_install() { 13do_install() {
14 install -d ${D}${datadir} 14 install -d ${D}${datadir}
diff --git a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
index ef15613586..357ddfdbca 100644
--- a/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
+++ b/meta-oe/recipes-support/uthash/uthash_2.3.0.bb
@@ -16,7 +16,6 @@ SRC_URI = "\
16 file://run-ptest \ 16 file://run-ptest \
17" 17"
18 18
19S = "${WORKDIR}/git"
20 19
21inherit ptest 20inherit ptest
22 21
diff --git a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
index bd69dbb11c..e42b19a8d0 100644
--- a/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-evemu_git.bb
@@ -14,6 +14,5 @@ SRCREV = "9752b50e922572e4cd214ac45ed95e4ee410fe24"
14 14
15PV = "1.0.6+git" 15PV = "1.0.6+git"
16 16
17S = "${WORKDIR}/git"
18 17
19PARALLEL_MAKE = "" 18PARALLEL_MAKE = ""
diff --git a/meta-oe/recipes-support/utouch/utouch-frame_git.bb b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
index ddd27a7e30..44994cafe0 100644
--- a/meta-oe/recipes-support/utouch/utouch-frame_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-frame_git.bb
@@ -18,4 +18,3 @@ SRCREV = "95363d5a1f7394d71144bf3b408ef4e6db4350fc"
18 18
19PV = "1.1.2+git" 19PV = "1.1.2+git"
20 20
21S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
index d964d7f263..eccaa81d18 100644
--- a/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
+++ b/meta-oe/recipes-support/utouch/utouch-mtview_git.bb
@@ -16,4 +16,3 @@ DEPENDS += "mtdev utouch-frame utouch-evemu libx11"
16 16
17PV = "1.1.7+git" 17PV = "1.1.7+git"
18 18
19S = "${WORKDIR}/git"
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch
new file mode 100644
index 0000000000..ec75d5a423
--- /dev/null
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/0001-fix-bool-reserved-word-error-in-gcc-15.patch
@@ -0,0 +1,28 @@
1From 76c443dfd209ddbed3ed4102596a568670d4c59f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Thu, 1 May 2025 20:16:11 -0700
4Subject: [PATCH] fix bool reserved word error in gcc 15
5
6gcc-15 switched to -std=c23 by default. https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=55e3bd376b2214e200fa76d12b67ff259b06c212
7
8Upstream-Status: Submitted [https://www.virtualbox.org/pipermail/vbox-dev/2025-May/010316.html]
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11 vboxsf/include/iprt/types.h | 4 +++-
12 1 file changed, 3 insertions(+), 1 deletion(-)
13
14diff --git a/vboxsf/include/iprt/types.h b/vboxsf/include/iprt/types.h
15index 3bcc4146..33b46ef6 100644
16--- a/vboxsf/include/iprt/types.h
17+++ b/vboxsf/include/iprt/types.h
18@@ -282,7 +282,9 @@ typedef _Bool bool;
19 # endif
20 # else
21 # undef bool /* see above netbsd explanation */
22-typedef _Bool bool;
23+# if defined __STDC__ && defined __STDC_VERSION__ && __STDC_VERSION__ <= 201710L
24+ typedef _Bool bool;
25+# endif
26 # endif
27 # else
28 # if RT_MSC_PREREQ(RT_MSC_VER_VC120)
diff --git a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.1.8.bb
index 47f616e990..dbfa454f13 100644
--- a/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb
+++ b/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.1.8.bb
@@ -1,34 +1,36 @@
1SUMMARY = "VirtualBox Linux Guest Drivers" 1SUMMARY = "VirtualBox Linux Guest Drivers"
2SECTION = "core" 2SECTION = "core"
3LICENSE = "GPL-3.0-only" 3LICENSE = "GPL-3.0-only"
4LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" 4LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a"
5 5
6DEPENDS = "virtual/kernel" 6DEPENDS = "virtual/kernel"
7 7
8inherit module kernel-module-split 8inherit module kernel-module-split
9 9
10COMPATIBLE_MACHINE = "(qemux86|qemux86-64)" 10COMPATIBLE_MACHINE = "(qemux86|qemux86-64|qemuarm64)"
11 11
12VBOX_NAME = "VirtualBox-${PV}" 12VBOX_NAME = "VirtualBox-${PV}"
13 13
14SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ 14SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \
15 file://Makefile.utils \ 15 file://Makefile.utils \
16 file://0001-fix-bool-reserved-word-error-in-gcc-15.patch \
16" 17"
17 18
18SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" 19SRC_URI[sha256sum] = "3f7132c55ac6c5f50585bfaa115d29e30b47ccf535cb0a12ff50214ddae2f63d"
19 20
20S ?= "${WORKDIR}/vbox_module" 21S ?= "${UNPACKDIR}/vbox_module"
21S:task-patch = "${WORKDIR}/${VBOX_NAME}" 22S:task-unpack = "${UNPACKDIR}/${VBOX_NAME}"
23S:task-patch = "${UNPACKDIR}/${BP}"
22 24
23export VBOX_KBUILD_TARGET_ARCH="${ARCH}" 25export VBOX_KBUILD_TARGET_ARCH = "${ARCH}"
24export VBOX_KBUILD_TARGET_ARCH:x86-64="amd64" 26export VBOX_KBUILD_TARGET_ARCH:x86-64 = "amd64"
25 27
26EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -fdebug-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -fdebug-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'" 28EXTRA_OEMAKE += "KERN_DIR='${WORKDIR}/${KERNEL_VERSION}/build' KBUILD_VERBOSE=1 CC='${CC} ${DEBUG_PREFIX_MAP} -ffile-prefix-map=${STAGING_KERNEL_DIR}=${KERNEL_SRC_PATH} -ffile-prefix-map=${STAGING_KERNEL_BUILDDIR}=${KERNEL_SRC_PATH}'"
27 29
28# otherwise 5.2.22 builds just vboxguest 30# otherwise 5.2.22 builds just vboxguest
29MAKE_TARGETS = "all" 31MAKE_TARGETS = "all"
30 32
31addtask export_sources after do_patch before do_configure 33addtask export_sources before do_patch after do_unpack
32do_export_sources[depends] += "virtual/kernel:do_shared_workdir" 34do_export_sources[depends] += "virtual/kernel:do_shared_workdir"
33 35
34do_export_sources() { 36do_export_sources() {
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
new file mode 100644
index 0000000000..40a7133052
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch
@@ -0,0 +1,30 @@
1From 984538dcce7b184269efc1e1b0fb78e1cb932b5d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 21 Mar 2025 01:21:22 -0700
4Subject: [PATCH] Fix build errors on RISCV
5 https://bugs.webkit.org/show_bug.cgi?id=290163
6
7Reviewed by NOBODY (OOPS!).
8
9Include c++ header <system_error> for std::error_code.
10
11* Source/WebCore/contentextensions/ContentExtensionActions.h: Include system_error
12
13Upstream-Status: Submitted [https://github.com/WebKit/WebKit/pull/42802]
14Signed-off-by: Khem Raj <raj.khem@gmail.com>
15---
16 Source/WebCore/contentextensions/ContentExtensionActions.h | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/Source/WebCore/contentextensions/ContentExtensionActions.h b/Source/WebCore/contentextensions/ContentExtensionActions.h
20index 0b75d2e1df78..61cb33c94ce8 100644
21--- a/Source/WebCore/contentextensions/ContentExtensionActions.h
22+++ b/Source/WebCore/contentextensions/ContentExtensionActions.h
23@@ -28,6 +28,7 @@
24 #if ENABLE(CONTENT_EXTENSIONS)
25
26 #include "ContentExtensionStringSerialization.h"
27+#include <system_error>
28 #include <wtf/JSONValues.h>
29 #include <wtf/Hasher.h>
30
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch
deleted file mode 100644
index e6a43c2fff..0000000000
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From fb81a5de7798eb7f68e0de1c281671553e1aa19d Mon Sep 17 00:00:00 2001
2From: Michael Catanzaro <mcatanzaro@redhat.com>
3Date: Mon, 5 Feb 2024 11:00:49 -0600
4Subject: [PATCH] =?UTF-8?q?LowLevelInterpreter.cpp:339:21:=20error:=20?=
5 =?UTF-8?q?=E2=80=98t6=E2=80=99=20was=20not=20declared=20in=20this=20scope?=
6 =?UTF-8?q?=20https://bugs.webkit.org/show=5Fbug.cgi=3Fid=3D268739?=
7MIME-Version: 1.0
8Content-Type: text/plain; charset=UTF-8
9Content-Transfer-Encoding: 8bit
10
11Unreviewed build fix. Seems a backport went badly, and we didn't notice
12because the code is architecture-specific.
13
14* Source/JavaScriptCore/llint/LowLevelInterpreter.cpp:
15(JSC::CLoop::execute):
16
17Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/3d5373575695b293b8559155431d0079a6153aff]
18Signed-off-by: Khem Raj <raj.khem@gmail.com>
19---
20 Source/JavaScriptCore/llint/LowLevelInterpreter.cpp | 2 --
21 1 file changed, 2 deletions(-)
22
23diff --git a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
24index 75cecbbd..b1020ea4 100644
25--- a/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
26+++ b/Source/JavaScriptCore/llint/LowLevelInterpreter.cpp
27@@ -336,8 +336,6 @@ JSValue CLoop::execute(OpcodeID entryOpcodeID, void* executableAddress, VM* vm,
28 UNUSED_VARIABLE(t2);
29 UNUSED_VARIABLE(t3);
30 UNUSED_VARIABLE(t5);
31- UNUSED_VARIABLE(t6);
32- UNUSED_VARIABLE(t7);
33
34 struct StackPointerScope {
35 StackPointerScope(CLoopStack& stack)
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
deleted file mode 100644
index b2e40a88c8..0000000000
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From 1523e00a2a76e285262c8aa3721b5d99f3f2d612 Mon Sep 17 00:00:00 2001
2From: Thomas Devoogdt <thomas.devoogdt@barco.com>
3Date: Mon, 16 Jan 2023 17:03:30 +0100
4Subject: [PATCH] REGRESSION(257865@main): B3Validate.cpp: fix
5
6 !ENABLE(WEBASSEMBLY_B3JIT)
7
8https://bugs.webkit.org/show_bug.cgi?id=250681
9
10Reviewed by NOBODY (OOPS!).
11
12WasmTypeDefinition.h isn't included if not ENABLE(WEBASSEMBLY_B3JIT).
13Also, toB3Type and simdScalarType are not defined if it is included.
14
15Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
16
17Upstream-Status: Inappropriate [https://bugs.launchpad.net/ubuntu/+source/webkit2gtk/+bug/2008798]
18---
19 Source/JavaScriptCore/b3/B3Validate.cpp | 12 +++++++++---
20 1 file changed, 9 insertions(+), 3 deletions(-)
21
22diff --git a/Source/JavaScriptCore/b3/B3Validate.cpp b/Source/JavaScriptCore/b3/B3Validate.cpp
23index eaaa3749..1d089783 100644
24--- a/Source/JavaScriptCore/b3/B3Validate.cpp
25+++ b/Source/JavaScriptCore/b3/B3Validate.cpp
26@@ -47,6 +47,12 @@
27 #include <wtf/StringPrintStream.h>
28 #include <wtf/text/CString.h>
29
30+#if ENABLE(WEBASSEMBLY) && ENABLE(WEBASSEMBLY_B3JIT)
31+#define simdScalarTypeToB3Type(type) toB3Type(Wasm::simdScalarType(type))
32+#else
33+#define simdScalarTypeToB3Type(type) B3::Type()
34+#endif
35+
36 namespace JSC { namespace B3 {
37
38 namespace {
39@@ -454,7 +460,7 @@ public:
40 case VectorExtractLane:
41 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
42 VALIDATE(value->numChildren() == 1, ("At ", *value));
43- VALIDATE(value->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
44+ VALIDATE(value->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
45 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
46 break;
47 case VectorReplaceLane:
48@@ -462,7 +468,7 @@ public:
49 VALIDATE(value->numChildren() == 2, ("At ", *value));
50 VALIDATE(value->type() == V128, ("At ", *value));
51 VALIDATE(value->child(0)->type() == V128, ("At ", *value));
52- VALIDATE(value->child(1)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
53+ VALIDATE(value->child(1)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
54 break;
55 case VectorDupElement:
56 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
57@@ -484,7 +490,7 @@ public:
58 VALIDATE(!value->kind().hasExtraBits(), ("At ", *value));
59 VALIDATE(value->numChildren() == 1, ("At ", *value));
60 VALIDATE(value->type() == V128, ("At ", *value));
61- VALIDATE(value->child(0)->type() == toB3Type(Wasm::simdScalarType(value->asSIMDValue()->simdLane())), ("At ", *value));
62+ VALIDATE(value->child(0)->type() == simdScalarTypeToB3Type(value->asSIMDValue()->simdLane()), ("At ", *value));
63 break;
64
65 case VectorPopcnt:
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch
new file mode 100644
index 0000000000..00347ef3e1
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-ftbfs-riscv64.patch
@@ -0,0 +1,39 @@
1From: Alberto Garcia <berto@igalia.com>
2Description: Use WTF_CPU_UNKNOWN when building for riscv64
3 WebKitGTK doesn't build on riscv64 even with the JIT disabled.
4 Treating the CPU as unknown is perhaps a bit severe, but it allows us
5 to get the build done until someone steps up to maintain this
6 properly.
7Bug: https://bugs.webkit.org/show_bug.cgi?id=271371
8Forwarded: no
9
10Upstream-Status: Pending
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12--- a/Source/WTF/wtf/PlatformCPU.h
13+++ b/Source/WTF/wtf/PlatformCPU.h
14@@ -286,14 +286,6 @@
15
16 #endif /* ARM */
17
18-/* CPU(RISCV64) - RISC-V 64-bit */
19-#if defined(__riscv) \
20- && defined(__riscv_xlen) \
21- && (__riscv_xlen == 64)
22-#define WTF_CPU_RISCV64 1
23-#define WTF_CPU_KNOWN 1
24-#endif
25-
26 #if !CPU(KNOWN)
27 #define WTF_CPU_UNKNOWN 1
28 #endif
29--- a/Source/cmake/WebKitCommon.cmake
30+++ b/Source/cmake/WebKitCommon.cmake
31@@ -125,8 +125,6 @@ if (NOT HAS_RUN_WEBKIT_COMMON)
32 set(WTF_CPU_PPC64 1)
33 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
34 set(WTF_CPU_PPC64LE 1)
35- elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64")
36- set(WTF_CPU_RISCV64 1)
37 elseif (LOWERCASE_CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64")
38 set(WTF_CPU_LOONGARCH64 1)
39 else ()
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch
new file mode 100644
index 0000000000..c3383fcd41
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/fix-typo-denormaldisabler.patch
@@ -0,0 +1,18 @@
1From: Alberto Garcia <berto@igalia.com>
2Subject: Fix build failure due to missing semicolon
3
4Source: https://sources.debian.org/data/main/w/webkit2gtk/2.48.1-2/debian/patches/fix-typo-denormaldisabler.patch
5
6Upstream-Status: Pending
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8--- a/Source/WebCore/platform/audio/DenormalDisabler.cpp
9+++ b/Source/WebCore/platform/audio/DenormalDisabler.cpp
10@@ -91,7 +91,7 @@ DenormalDisabler::~DenormalDisabler()
11 }
12 }
13 #else
14-DenormalDisabler::DenormalDisabler() = default
15+DenormalDisabler::DenormalDisabler() = default;
16 DenormalDisabler::~DenormalDisabler() = default;
17 #endif
18
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
index 37bc6538c3..367e6b8342 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/no-musttail-arm.patch
@@ -1,6 +1,6 @@
1From c50f2277509f2e6f087cda2eaf323eaf569aad8d Mon Sep 17 00:00:00 2001 1From 4602261fa44d6bbb4c3698c79e08a6a40a6edc5a Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Sat, 30 Sep 2023 12:42:06 -0700 3Date: Fri, 12 Jan 2024 09:21:39 -0800
4Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL 4Subject: [PATCH] clang/arm: Do not use MUST_TAIL_CALL
5 5
6This causes clang-17 to crash see [1] 6This causes clang-17 to crash see [1]
@@ -9,22 +9,26 @@ this code is new in webkit 2.42[2] thats why we do not see the crash in older we
9[1] https://github.com/llvm/llvm-project/issues/67767 9[1] https://github.com/llvm/llvm-project/issues/67767
10[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35 10[2] https://github.com/WebKit/WebKit/commit/4d816460b765acd8aef90ab474615850b91ecc35
11 11
12Upstream-Status: Pending 12Upstream-Status: Inappropriate [work around to avoid clang compiler crash]
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14
15Update context for webkitgtk 2.48.0.
16
17Signed-off-by: Kai Kang <kai.kang@windriver.com>
14--- 18---
15 Source/WTF/wtf/Compiler.h | 2 +- 19 Source/WTF/wtf/Compiler.h | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 20 1 file changed, 1 insertion(+), 1 deletion(-)
17 21
18diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h 22diff --git a/Source/WTF/wtf/Compiler.h b/Source/WTF/wtf/Compiler.h
19index 449ca502..daac29d7 100644 23index 16e416d..68dd9a0 100644
20--- a/Source/WTF/wtf/Compiler.h 24--- a/Source/WTF/wtf/Compiler.h
21+++ b/Source/WTF/wtf/Compiler.h 25+++ b/Source/WTF/wtf/Compiler.h
22@@ -321,7 +321,7 @@ 26@@ -293,7 +293,7 @@
23 /* MUST_TAIL_CALL */ 27 #if COMPILER(CLANG)
24 28 #if __SIZEOF_POINTER__ == 8
25 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute) 29 #if !defined(MUST_TAIL_CALL) && defined(__cplusplus) && defined(__has_cpp_attribute)
26-#if __has_cpp_attribute(clang::musttail) 30-#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32)
27+#if __has_cpp_attribute(clang::musttail) && !defined(__arm__) 31+#if __has_cpp_attribute(clang::musttail) && !defined(__powerpc__) && !defined(_WIN32) && !defined(__arm__)
28 #define MUST_TAIL_CALL [[clang::musttail]] 32 #define MUST_TAIL_CALL [[clang::musttail]]
29 #endif 33 #define HAVE_MUST_TAIL_CALL 1
30 #endif 34 #endif
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch b/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch
new file mode 100644
index 0000000000..19d18dea88
--- /dev/null
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3/sys_futex.patch
@@ -0,0 +1,16 @@
1Fix build on newer 32bit architectures with only 64bit time_t
2
3Upstream-Status: Submitted [https://chromium-review.googlesource.com/c/angle/angle/+/6108397]
4Signed-off-by: Khem Raj <raj.khem@gmail.com>
5--- a/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
6+++ b/Source/ThirdParty/ANGLE/src/common/SimpleMutex.cpp
7@@ -17,6 +17,9 @@
8 # include <linux/futex.h>
9 # include <sys/syscall.h>
10 # include <unistd.h>
11+# if !defined(SYS_futex) && defined(SYS_futex_time64)
12+# define SYS_futex SYS_futex_time64
13+# endif
14 # endif // defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_ANDROID)
15
16 # if defined(ANGLE_PLATFORM_WINDOWS)
diff --git a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb
index 31480b8d8e..d11d4808fd 100644
--- a/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb
+++ b/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.48.1.bb
@@ -1,4 +1,8 @@
1SUMMARY = "WebKit web rendering engine for the GTK+ platform" 1SUMMARY = "WebKit web rendering engine for the GTK+ platform"
2DESCRIPTION = "\
3 This recipe builds with Gtk3 (instead of Gtk4) which results in API version 4.1 \
4 (having javascriptcoregtk-4.1.pc instead of 6.0). \
5"
2HOMEPAGE = "https://www.webkitgtk.org/" 6HOMEPAGE = "https://www.webkitgtk.org/"
3BUGTRACKER = "https://bugs.webkit.org/" 7BUGTRACKER = "https://bugs.webkit.org/"
4 8
@@ -13,14 +17,16 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \
13 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \ 17 file://0001-FindGObjectIntrospection.cmake-prefix-variables-obta.patch \
14 file://reproducibility.patch \ 18 file://reproducibility.patch \
15 file://no-musttail-arm.patch \ 19 file://no-musttail-arm.patch \
16 file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ 20 file://sys_futex.patch \
17 file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ 21 file://0001-Fix-build-errors-on-RISCV-https-bugs.webkit.org-show.patch \
22 file://fix-typo-denormaldisabler.patch \
23 file://fix-ftbfs-riscv64.patch \
18 " 24 "
19SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" 25SRC_URI[sha256sum] = "98efdf21c4cdca0fe0b73ab5a8cb52093b5aa52d9b1b016a93f71dbfa1eb258f"
20 26
21inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen 27inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen
22 28
23S = "${WORKDIR}/webkitgtk-${PV}" 29S = "${UNPACKDIR}/webkitgtk-${PV}"
24 30
25ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" 31ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
26REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}" 32REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'opengl', '', d)}"
@@ -46,6 +52,8 @@ DEPENDS += " \
46 gettext-native \ 52 gettext-native \
47 " 53 "
48 54
55# using soup2 builds (JavaScript) API version 4.0
56# using soup3 builds (JavaScript) API version 4.1
49PACKAGECONFIG_SOUP ?= "soup3" 57PACKAGECONFIG_SOUP ?= "soup3"
50PACKAGECONFIG ??= " \ 58PACKAGECONFIG ??= " \
51 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ 59 ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \
@@ -83,6 +91,8 @@ PACKAGECONFIG[gamepad] = "-DENABLE_GAMEPAD=ON,-DENABLE_GAMEPAD=OFF,libmanette"
83PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF" 91PACKAGECONFIG[webrtc] = "-DENABLE_WEB_RTC=ON,-DENABLE_WEB_RTC=OFF"
84PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy" 92PACKAGECONFIG[bubblewrap] = "-DENABLE_BUBBLEWRAP_SANDBOX=ON -DBWRAP_EXECUTABLE=${bindir}/bwrap -DDBUS_PROXY_EXECUTABLE=${bindir}/xdg-dbus-proxy,-DENABLE_BUBBLEWRAP_SANDBOX=OFF,,bubblewrap xdg-dbus-proxy"
85PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace" 93PACKAGECONFIG[backtrace] = "-DUSE_LIBBACKTRACE=ON,-DUSE_LIBBACKTRACE=OFF,libbacktrace"
94PACKAGECONFIG[sysprof-capture] = "-DUSE_SYSTEM_SYSPROF_CAPTURE=YES,-DUSE_SYSTEM_SYSPROF_CAPTURE=NO,sysprof"
95PACKAGECONFIG[speech] = "-DENABLE_SPEECH_SYNTHESIS=ON,-DENABLE_SPEECH_SYNTHESIS=OFF,flite"
86 96
87EXTRA_OECMAKE = " \ 97EXTRA_OECMAKE = " \
88 -DPORT=GTK \ 98 -DPORT=GTK \
@@ -92,9 +102,8 @@ EXTRA_OECMAKE = " \
92 -DENABLE_MINIBROWSER=ON \ 102 -DENABLE_MINIBROWSER=ON \
93 -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ 103 -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \
94 " 104 "
95# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the 105# pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing)
96# debug symbols (4.3GB to 700M at time of writing) 106DEBUG_LEVELFLAG = "-g1"
97DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}"
98 107
99# Javascript JIT is not supported on ARC 108# Javascript JIT is not supported on ARC
100EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " 109EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF "
@@ -127,12 +136,8 @@ EXTRA_OECMAKE:append:armv7a = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES
127EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" 136EXTRA_OECMAKE:append:armv7r = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
128EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}" 137EXTRA_OECMAKE:append:armv7ve = " -DENABLE_JIT=${@bb.utils.contains('TUNE_FEATURES', 'callconvention-hard', 'ON', 'OFF', d)}"
129 138
130EXTRA_OECMAKE:append:mipsarch = " -DUSE_LD_GOLD=OFF " 139# JIT does not work on RISCV
131EXTRA_OECMAKE:append:powerpc = " -DUSE_LD_GOLD=OFF " 140EXTRA_OECMAKE:append:riscv32 = " -DENABLE_JIT=OFF"
132
133# JIT and gold linker does not work on RISCV
134EXTRA_OECMAKE:append:riscv32 = " -DUSE_LD_GOLD=OFF -DENABLE_JIT=OFF"
135EXTRA_OECMAKE:append:riscv64 = " -DUSE_LD_GOLD=OFF"
136 141
137# JIT not supported on MIPS either 142# JIT not supported on MIPS either
138EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON " 143EXTRA_OECMAKE:append:mipsarch = " -DENABLE_JIT=OFF -DENABLE_C_LOOP=ON "
diff --git a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
index f437accc50..17b71411ca 100644
--- a/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
+++ b/meta-oe/recipes-support/websocketpp/websocketpp_0.8.2.bb
@@ -23,9 +23,8 @@ RDEPENDS:${PN}-dev = ""
23# TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev" 23# TOOLCHAIN_TARGET_TASK:append = " websocketpp-dev"
24 24
25# tag 0.8.2 25# tag 0.8.2
26SRCREV= "56123c87598f8b1dd471be83ca841ceae07f95ba" 26SRCREV = "56123c87598f8b1dd471be83ca841ceae07f95ba"
27 27
28S = "${WORKDIR}/git"
29 28
30inherit cmake 29inherit cmake
31 30
@@ -37,3 +36,5 @@ do_install:append() {
37 install -d ${D}${docdir}/${BPN} 36 install -d ${D}${docdir}/${BPN}
38 cp -R ${S}/examples ${D}${docdir}/${BPN} 37 cp -R ${S}/examples ${D}${docdir}/${BPN}
39} 38}
39
40SKIP_RECIPE[websocketpp] ?= "Does not work with boost >= 1.87"
diff --git a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
index 6b35d71a55..93692af682 100644
--- a/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
+++ b/meta-oe/recipes-support/xdelta/xdelta3_3.1.0.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
9 9
10SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https" 10SRC_URI = "git://github.com/jmacd/xdelta.git;branch=release3_1_apl;protocol=https"
11SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709" 11SRCREV = "4b4aed71a959fe11852e45242bb6524be85d3709"
12S = "${WORKDIR}/git/xdelta3" 12S = "${UNPACKDIR}/${BP}/xdelta3"
13 13
14inherit autotools 14inherit autotools
15 15
diff --git a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
index e10ccd04ea..43536f5d7b 100644
--- a/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb
+++ b/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb
@@ -13,7 +13,6 @@ inherit meson pkgconfig
13 13
14SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" 14SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main"
15 15
16S = "${WORKDIR}/git" 16SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496"
17SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10"
18 17
19BBCLASSEXTEND = "native" 18BBCLASSEXTEND = "native"
diff --git a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.0.bb
index 87e8f1f5e9..440d836874 100644
--- a/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.18.4.bb
+++ b/meta-oe/recipes-support/xdg-desktop-portal/xdg-desktop-portal_1.20.0.bb
@@ -27,18 +27,18 @@ RDEPENDS:${PN} = "bubblewrap rtkit ${PORTAL_BACKENDS} fuse3-utils"
27inherit meson pkgconfig python3native features_check 27inherit meson pkgconfig python3native features_check
28 28
29SRC_URI = " \ 29SRC_URI = " \
30 git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=xdg-desktop-portal-1.18 \ 30 git://github.com/flatpak/xdg-desktop-portal.git;protocol=https;branch=main \
31 file://0001-meson.build-add-a-hack-for-crosscompile.patch \ 31 file://0001-meson.build-add-a-hack-for-crosscompile.patch \
32" 32"
33 33
34S = "${WORKDIR}/git" 34SRCREV = "85df26fb1c53334969fea3f15c2a06a14831094b"
35SRCREV = "11c8a96b147aeae70e3f770313f93b367d53fedd"
36 35
37FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1" 36FILES:${PN} += "${libdir}/systemd ${datadir}/dbus-1"
38 37
39EXTRA_OEMESON += " \ 38EXTRA_OEMESON += " \
40 --cross-file=${WORKDIR}/meson-${PN}.cross \ 39 --cross-file=${WORKDIR}/meson-${PN}.cross \
41 -Ddbus-service-dir=${datadir}/dbus-1/services \ 40 -Ddbus-service-dir=${datadir}/dbus-1/services \
41 -Dtests=disabled \
42" 42"
43 43
44do_write_config:append() { 44do_write_config:append() {
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
index f107f42dab..9bb017b63b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch
@@ -1,4 +1,4 @@
1From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 1From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001
2From: Chen Qi <Qi.Chen@windriver.com> 2From: Chen Qi <Qi.Chen@windriver.com>
3Date: Tue, 4 Feb 2020 23:39:49 -0800 3Date: Tue, 4 Feb 2020 23:39:49 -0800
4Subject: [PATCH] nss/nspr: fix for multilib 4Subject: [PATCH] nss/nspr: fix for multilib
@@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib
6Upstream-Status: Pending 6Upstream-Status: Pending
7 7
8Signed-off-by: Chen Qi <Qi.Chen@windriver.com> 8Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
9
10--- 9---
11 configure.ac | 16 ++++++++-------- 10 configure.ac | 16 ++++++++--------
12 1 file changed, 8 insertions(+), 8 deletions(-) 11 1 file changed, 8 insertions(+), 8 deletions(-)
13 12
14diff --git a/configure.ac b/configure.ac 13diff --git a/configure.ac b/configure.ac
15index 51621d6..3d23683 100644 14index 40e9c0d..8f42d4d 100644
16--- a/configure.ac 15--- a/configure.ac
17+++ b/configure.ac 16+++ b/configure.ac
18@@ -960,24 +960,24 @@ fi 17@@ -966,24 +966,24 @@ fi
19 dnl Priority 1: User specifies the path to installation 18 dnl Priority 1: User specifies the path to installation
20 if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then 19 if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then
21 AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) 20 AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder)
@@ -28,8 +27,8 @@ index 51621d6..3d23683 100644
28 NSPR_FOUND="yes" 27 NSPR_FOUND="yes"
29 AC_MSG_RESULT([yes]) 28 AC_MSG_RESULT([yes])
30 else 29 else
31- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER" files don't exist), typo?]) 30- AC_MSG_ERROR([not found: "$with_nspr/include/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/lib/$NSPR_LIB_MARKER"])
32+ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER" files don't exist), typo?]) 31+ AC_MSG_ERROR([not found: "$with_nspr/${includedir}/$NSPR_INCLUDE_MARKER" and/or "$with_nspr/${libdir}/$NSPR_LIB_MARKER"])
33 fi 32 fi
34 fi 33 fi
35 if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then 34 if test "z$NSS_FOUND" = "zno" -a "z$with_nss" != "z" -a "z$with_nss" != "zyes" ; then
@@ -43,8 +42,11 @@ index 51621d6..3d23683 100644
43 NSS_FOUND="yes" 42 NSS_FOUND="yes"
44 AC_MSG_RESULT([yes]) 43 AC_MSG_RESULT([yes])
45 else 44 else
46- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER" files don't exist), typo?]) 45- AC_MSG_ERROR([not found: "$with_nss/include/$NSS_INCLUDE_MARKER" and/or "$with_nss/lib/$NSS_LIB_MARKER"])
47+ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER" files don't exist), typo?]) 46+ AC_MSG_ERROR([not found: "$with_nss/${includedir}/$NSS_INCLUDE_MARKER" and/or "$with_nss/${libdir}/$NSS_LIB_MARKER"])
48 fi 47 fi
49 fi 48 fi
50 49
50--
512.43.0
52
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
index 3a1531deb1..61c56ffc8b 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch
@@ -1,4 +1,4 @@
1From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 1From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001
2From: Yulong Pei <Yulong.pei@windriver.com> 2From: Yulong Pei <Yulong.pei@windriver.com>
3Date: Wed, 21 Jul 2010 22:33:43 +0800 3Date: Wed, 21 Jul 2010 22:33:43 +0800
4Subject: [PATCH] change finding path of nss and nspr 4Subject: [PATCH] change finding path of nss and nspr
@@ -8,16 +8,15 @@ Upstream-Status: Pending
8Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> 8Signed-off-by: Yulong Pei <Yulong.pei@windriver.com>
9Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> 9Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com>
10Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 10Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
11
12--- 11---
13 configure.ac | 2 +- 12 configure.ac | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
15 14
16diff --git a/configure.ac b/configure.ac 15diff --git a/configure.ac b/configure.ac
17index ce8a278..51621d6 100644 16index 8add879..7f137c0 100644
18--- a/configure.ac 17--- a/configure.ac
19+++ b/configure.ac 18+++ b/configure.ac
20@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss 19@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss
21 NSPR_INCLUDE_MARKER="nspr/nspr.h" 20 NSPR_INCLUDE_MARKER="nspr/nspr.h"
22 NSPR_LIB_MARKER="libnspr4$shrext" 21 NSPR_LIB_MARKER="libnspr4$shrext"
23 NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" 22 NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4"
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
index 26ebce343d..55ae9887f2 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/makefile-ptest.patch
@@ -14,11 +14,11 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
14 1 file changed, 10 insertions(+), 2 deletions(-) 14 1 file changed, 10 insertions(+), 2 deletions(-)
15 15
16diff --git a/examples/Makefile b/examples/Makefile 16diff --git a/examples/Makefile b/examples/Makefile
17index 02480c2..cbc2661 100644 17index 0b352bc..de3c217 100644
18--- a/examples/Makefile 18--- a/examples/Makefile
19+++ b/examples/Makefile 19+++ b/examples/Makefile
20@@ -8,9 +8,17 @@ PROGRAMS = \ 20@@ -12,9 +12,17 @@ PROGRAMS = \
21 decrypt1 decrypt2 decrypt3 \ 21 $(PROGRAMS_DEC) \
22 xmldsigverify 22 xmldsigverify
23 23
24+ifndef CC 24+ifndef CC
@@ -38,5 +38,5 @@ index 02480c2..cbc2661 100644
38 all: $(PROGRAMS) 38 all: $(PROGRAMS)
39 39
40-- 40--
412.25.1 412.43.0
42 42
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
index 9e6a6a840f..50706793b2 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1/xmlsec1-examples-allow-build-in-separate-dir.patch
@@ -11,10 +11,10 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
11 1 file changed, 4 insertions(+), 2 deletions(-) 11 1 file changed, 4 insertions(+), 2 deletions(-)
12 12
13diff --git a/examples/Makefile b/examples/Makefile 13diff --git a/examples/Makefile b/examples/Makefile
14index cbc2661..e882b61 100644 14index de3c217..2e0ab6e 100644
15--- a/examples/Makefile 15--- a/examples/Makefile
16+++ b/examples/Makefile 16+++ b/examples/Makefile
17@@ -12,8 +12,10 @@ ifndef CC 17@@ -16,8 +16,10 @@ ifndef CC
18 CC = gcc 18 CC = gcc
19 endif 19 endif
20 20
@@ -28,5 +28,5 @@ index cbc2661..e882b61 100644
28 DESTDIR = /usr/share/xmlsec1 28 DESTDIR = /usr/share/xmlsec1
29 install-ptest: 29 install-ptest:
30-- 30--
312.25.1 312.43.0
32 32
diff --git a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb
index 7639209e19..0f4ae205b1 100644
--- a/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb
+++ b/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.7.bb
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0"
12 12
13SECTION = "libs" 13SECTION = "libs"
14 14
15SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ 15SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PV}/${BP}.tar.gz \
16 file://fix-ltmain.sh.patch \ 16 file://fix-ltmain.sh.patch \
17 file://change-finding-path-of-nss.patch \ 17 file://change-finding-path-of-nss.patch \
18 file://makefile-ptest.patch \ 18 file://makefile-ptest.patch \
@@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \
22 file://ensure-search-path-non-host.patch \ 22 file://ensure-search-path-non-host.patch \
23 " 23 "
24 24
25SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" 25SRC_URI[sha256sum] = "d82e93b69b8aa205a616b62917a269322bf63a3eaafb3775014e61752b2013ea"
26 26
27inherit autotools-brokensep ptest pkgconfig 27inherit autotools-brokensep ptest pkgconfig
28 28
@@ -54,8 +54,11 @@ do_compile_ptest () {
54} 54}
55 55
56do_install:append() { 56do_install:append() {
57 for i in ${bindir}/xmlsec1-config ${libdir}/xmlsec1Conf.sh \ 57 for i in \
58 ${libdir}/pkgconfig/xmlsec1-openssl.pc; do 58 ${bindir}/xmlsec1-config \
59 ${libdir}/xmlsec1Conf.sh \
60 ${libdir}/pkgconfig/xmlsec1-openssl.pc \
61 ${libdir}/pkgconfig/xmlsec1-gnutls.pc; do
59 sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i 62 sed -i -e "s@${RECIPE_SYSROOT}@@g" ${D}$i
60 done 63 done
61} 64}
diff --git a/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch b/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch
new file mode 100644
index 0000000000..1468559e7f
--- /dev/null
+++ b/meta-oe/recipes-support/xmlstarlet/files/0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch
@@ -0,0 +1,37 @@
1From 4e94034e9231f5d8312497b7504f21b7a6062bf4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 27 May 2025 16:12:01 -0700
4Subject: [PATCH] Define ATTRIBUTE_UNUSED if its not defined
5
6ATTRIBUTE_UNUSED is not defined in libxml2 2.14+, so check if the define is
7not there then define it.
8
9Fixes build errors e.g.
10../xmlstarlet-1.6.1/src/xml_pyx.c:203:36: error: expected ')'
11 203 | pyxExternalSubsetHandler(void *ctx ATTRIBUTE_UNUSED, const xmlChar *name,
12 | ^
13
14Upstream-Status: Pending
15Signed-off-by: Khem Raj <raj.khem@gmail.com>
16---
17 src/xml_pyx.c | 7 +++++++
18 1 file changed, 7 insertions(+)
19
20diff --git a/src/xml_pyx.c b/src/xml_pyx.c
21index ab295f1..f1a1884 100644
22--- a/src/xml_pyx.c
23+++ b/src/xml_pyx.c
24@@ -21,6 +21,13 @@
25
26 #include "xmlstar.h"
27
28+/**
29+ * Unbreak build with libxml2 2.14
30+ */
31+#ifndef ATTRIBUTE_UNUSED
32+#define ATTRIBUTE_UNUSED __attribute__((unused))
33+#endif
34+
35 /**
36 * Output newline and tab characters as escapes
37 * Required both for attribute values and character data (#PCDATA)
diff --git a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
index 61eeaaa095..c8cfd884e2 100644
--- a/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
+++ b/meta-oe/recipes-support/xmlstarlet/xmlstarlet_1.6.1.bb
@@ -16,13 +16,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/xmlstar/${BP}.tar.gz \
16 file://configure.ac.patch \ 16 file://configure.ac.patch \
17 file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \ 17 file://0001-usage2c.awk-fix-wrong-basename-regexp.patch \
18 file://0001-Make-xmlError-struct-constant.patch \ 18 file://0001-Make-xmlError-struct-constant.patch \
19 file://0001-Fix-hash_key_put-signature.patch" 19 file://0001-Fix-hash_key_put-signature.patch \
20 file://0001-Define-ATTRIBUTE_UNUSED-if-its-not-defined.patch"
20SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca" 21SRC_URI[sha256sum] = "15d838c4f3375332fd95554619179b69e4ec91418a3a5296e7c631b7ed19e7ca"
21 22
22inherit autotools 23inherit autotools
23 24
24# doc build: requires (native) xstlproc, fop, pdf2ps 25# doc build: requires (native) xstlproc, fop, pdf2ps
25EXTRA_OECONF="--disable-build-docs \ 26EXTRA_OECONF = "--disable-build-docs \
26 --with-libxml-prefix=${STAGING_LIBDIR}/.. \ 27 --with-libxml-prefix=${STAGING_LIBDIR}/.. \
27 --with-libxslt-prefix=${STAGING_LIBDIR}/.." 28 --with-libxslt-prefix=${STAGING_LIBDIR}/.."
28 29
diff --git a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
index 9650d43695..533b0801cb 100644
--- a/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
+++ b/meta-oe/recipes-support/xorg-xrdp/xorgxrdp_0.9.19.bb
@@ -16,8 +16,13 @@ SRCREV = "d463bad9639c910fadc2f30dac473c7688b11cfc"
16 16
17PV = "0.9.19" 17PV = "0.9.19"
18 18
19S = "${WORKDIR}/git"
20 19
21FILES:${PN} += "${libdir}/xorg/modules/*" 20FILES:${PN} += "${libdir}/xorg/modules/*"
22 21
23INSANE_SKIP:${PN} += "xorg-driver-abi" 22require recipes-graphics/xorg-xserver/xserver-abi.inc
23
24python add_xorg_abi_depends() {
25 _add_xorg_abi_depends(d, "xinput")
26 _add_xorg_abi_depends(d, "videodrv")
27}
28PACKAGEFUNCS =+ "add_xorg_abi_depends"
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
index 05803266cb..926ad93bbe 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Added-req_distinguished_name-in-etc-xrdp-openssl.con.patch
@@ -1,7 +1,7 @@
1From d705b1d666cb8713d86ea6fb2fc45c424128285a Mon Sep 17 00:00:00 2001 1From abdfa0fddeceab843ab6eabe31c7763c8719642b Mon Sep 17 00:00:00 2001
2From: Lei Maohui <leimaohui@cn.fujitsu.com> 2From: Lei Maohui <leimaohui@cn.fujitsu.com>
3Date: Fri, 1 Dec 2017 10:24:50 +0900 3Date: Fri, 1 Dec 2017 10:24:50 +0900
4Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf, 4Subject: [PATCH] Added req_distinguished_name in /etc/xrdp/openssl.conf,
5 otherwise, cert.pem can't be created. 5 otherwise, cert.pem can't be created.
6 6
7Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> 7Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
@@ -30,6 +30,3 @@ index 09db6c2..f077d72 100644
30 30
31 [v3_ca] 31 [v3_ca]
32 # Extensions for a typical CA - PKIX recommendation. 32 # Extensions for a typical CA - PKIX recommendation.
33--
341.8.4.2
35
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
index e8b4ffa6bf..1bb84001f3 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-Fix-the-compile-error.patch
@@ -1,3 +1,6 @@
1From 2fa575c3171688ceb0dc867a52628046b3f60d91 Mon Sep 17 00:00:00 2001
2From: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
3Date: Tue, 12 Dec 2017 22:36:50 +0800
1Subject: [PATCH] Fix the make error 4Subject: [PATCH] Fix the make error
2 5
3Fix the compile error: 6Fix the compile error:
@@ -11,10 +14,10 @@ Upstream-Status: Pending
11 1 file changed, 2 insertions(+), 2 deletions(-) 14 1 file changed, 2 insertions(+), 2 deletions(-)
12 15
13diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am 16diff --git a/xrdp/Makefile.am b/xrdp/Makefile.am
14index a259ef3..d5505b2 100644 17index 71d0f76..f41751b 100644
15--- a/xrdp/Makefile.am 18--- a/xrdp/Makefile.am
16+++ b/xrdp/Makefile.am 19+++ b/xrdp/Makefile.am
17@@ -23,7 +23,7 @@ endif 20@@ -21,7 +21,7 @@ XRDP_EXTRA_LIBS =
18 if XRDP_RFXCODEC 21 if XRDP_RFXCODEC
19 AM_CPPFLAGS += -DXRDP_RFXCODEC 22 AM_CPPFLAGS += -DXRDP_RFXCODEC
20 AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include 23 AM_CPPFLAGS += -I$(top_srcdir)/librfxcodec/include
@@ -23,7 +26,7 @@ index a259ef3..d5505b2 100644
23 endif 26 endif
24 27
25 if XRDP_PIXMAN 28 if XRDP_PIXMAN
26@@ -35,7 +35,7 @@ endif 29@@ -33,7 +33,7 @@ endif
27 if XRDP_PAINTER 30 if XRDP_PAINTER
28 AM_CPPFLAGS += -DXRDP_PAINTER 31 AM_CPPFLAGS += -DXRDP_PAINTER
29 AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include 32 AM_CPPFLAGS += -I$(top_srcdir)/libpainter/include
@@ -32,6 +35,3 @@ index a259ef3..d5505b2 100644
32 endif 35 endif
33 36
34 sbin_PROGRAMS = \ 37 sbin_PROGRAMS = \
35--
362.7.4
37
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
index ea3eb11f0a..01449e2a5f 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-arch-Define-NO_NEED_ALIGN-on-ppc64.patch
@@ -1,4 +1,4 @@
1From 5958db649855bfb2ada7c0ed22a00f839b9a1161 Mon Sep 17 00:00:00 2001 1From 71e8fd272a4609cf3b6a0802cee82e2861a1fa0c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 12 Mar 2021 21:40:35 -0800 3Date: Fri, 12 Mar 2021 21:40:35 -0800
4Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64 4Subject: [PATCH] arch: Define NO_NEED_ALIGN on ppc64
@@ -10,10 +10,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
10 1 file changed, 1 insertion(+), 1 deletion(-) 10 1 file changed, 1 insertion(+), 1 deletion(-)
11 11
12diff --git a/common/arch.h b/common/arch.h 12diff --git a/common/arch.h b/common/arch.h
13index 617feb5e..6edb39db 100644 13index ec0aa05..f574656 100644
14--- a/common/arch.h 14--- a/common/arch.h
15+++ b/common/arch.h 15+++ b/common/arch.h
16@@ -85,7 +85,7 @@ typedef int bool_t; 16@@ -86,7 +86,7 @@ typedef int bool_t;
17 #define NEED_ALIGN 17 #define NEED_ALIGN
18 #elif defined(__x86__) || defined(__x86_64__) || \ 18 #elif defined(__x86__) || defined(__x86_64__) || \
19 defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \ 19 defined(__AMD64__) || defined(_M_IX86) || defined (_M_AMD64) || \
@@ -22,6 +22,3 @@ index 617feb5e..6edb39db 100644
22 defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \ 22 defined(__PPC__) || defined(__LITTLE_ENDIAN__) || \
23 defined(__s390__) || defined (__s390x__) || \ 23 defined(__s390__) || defined (__s390x__) || \
24 defined(__riscv) 24 defined(__riscv)
25--
262.31.1
27
diff --git a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
index 77a394d556..2559ab7b31 100644
--- a/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
+++ b/meta-oe/recipes-support/xrdp/xrdp/0001-mark-count-with-unused-attribute.patch
@@ -1,4 +1,4 @@
1From 492f74dbea1d9a15fbc3e870e78ab52e7fc5583b Mon Sep 17 00:00:00 2001 1From 23638d0ec23c2658a4e98321c20a4a2ac9294fb2 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 31 Aug 2022 20:19:32 -0700 3Date: Wed, 31 Aug 2022 20:19:32 -0700
4Subject: [PATCH] mark count with unused attribute 4Subject: [PATCH] mark count with unused attribute
@@ -14,7 +14,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c 16diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c
17index 4452d998..b818bff3 100644 17index d66310b..eeb5921 100644
18--- a/sesman/chansrv/chansrv.c 18--- a/sesman/chansrv/chansrv.c
19+++ b/sesman/chansrv/chansrv.c 19+++ b/sesman/chansrv/chansrv.c
20@@ -195,7 +195,7 @@ check_timeout(void) 20@@ -195,7 +195,7 @@ check_timeout(void)
@@ -24,8 +24,5 @@ index 4452d998..b818bff3 100644
24- int count; 24- int count;
25+ int count __attribute__((unused)); 25+ int count __attribute__((unused));
26 tui32 now; 26 tui32 now;
27 27 UNUSED_VAR(count);
28 LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:"); 28 LOG_DEVEL(LOG_LEVEL_DEBUG, "check_timeout:");
29--
302.37.3
31
diff --git a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
index c1b75e6138..a60c125d06 100644
--- a/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb
+++ b/meta-oe/recipes-support/xrdp/xrdp_0.9.20.bb
@@ -18,7 +18,10 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN
18 file://0001-mark-count-with-unused-attribute.patch \ 18 file://0001-mark-count-with-unused-attribute.patch \
19 " 19 "
20 20
21SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" 21SRC_URI[sha256sum] = "db693401da95b71b4d4e4c99aeb569a546dbdbde343f6d3302b0c47653277abb"
22
23UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases"
24UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)"
22 25
23CFLAGS += " -Wno-deprecated-declarations" 26CFLAGS += " -Wno-deprecated-declarations"
24 27
diff --git a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb b/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
deleted file mode 100644
index 76aea6f41a..0000000000
--- a/meta-oe/recipes-support/xserver-xorg-cvt/xserver-xorg-cvt-native_1.20.10.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1SUMMARY = "X.Org X cvt"
2HOMEPAGE = "https://linux.die.net/man/1/cvt"
3LICENSE = "MIT"
4LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880"
5
6DEPENDS += "pixman-native xorgproto-native libxrandr-native"
7
8XORG_PN = "xorg-server"
9
10SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2"
11SRC_URI[md5sum] = "8cf8bd1f33e3736bc8dd279b20a32399"
12SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99"
13
14S = "${WORKDIR}/${XORG_PN}-${PV}"
15B = "${WORKDIR}/build"
16
17inherit pkgconfig native
18
19do_configure[noexec] = "1"
20
21do_compile() {
22 cd ${S}
23 for header in `find -name '*.h'`; do
24 path=`dirname $header`
25 if ! echo "$incpaths" | grep -q "$path" ; then
26 incpaths="$incpaths -I$path"
27 fi
28 done
29 CFLAGS="${CFLAGS} -DXORG_VERSION_CURRENT=1 $incpaths `pkg-config --cflags pixman-1`"
30 LDFLAGS="${LDFLAGS} -lm `pkg-config --libs pixman-1`"
31 ${CC} $CFLAGS -o ${B}/cvt \
32 ${S}/hw/xfree86/utils/cvt/cvt.c \
33 ${S}/hw/xfree86/modes/xf86cvt.c \
34 ${S}/os/xprintf.c \
35 $LDFLAGS
36}
37
38do_install() {
39 install -d ${D}${bindir}
40 install -m 755 ${B}/cvt ${D}${bindir}
41}
diff --git a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
index 44ac0687a7..09db5519ea 100644
--- a/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
+++ b/meta-oe/recipes-support/yaml-cpp/yaml-cpp_0.8.0.bb
@@ -8,9 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=6a8aaf0595c2efc1a9c2e0913e9c1a2c"
8# yaml-cpp releases are stored as archive files in github. 8# yaml-cpp releases are stored as archive files in github.
9# download the exact revision of release 9# download the exact revision of release
10SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https" 10SRC_URI = "git://github.com/jbeder/yaml-cpp.git;branch=master;protocol=https"
11SRCREV = "f7320141120f720aecc4c32be25586e7da9eb978" 11SRCREV = "28f93bdec6387d42332220afa9558060c8016795"
12PV .= "+git"
12 13
13S = "${WORKDIR}/git"
14 14
15inherit cmake 15inherit cmake
16 16
diff --git a/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb b/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb
new file mode 100644
index 0000000000..0655f225b4
--- /dev/null
+++ b/meta-oe/recipes-support/yyjson/yyjson_0.11.1.bb
@@ -0,0 +1,33 @@
1DESCRIPTION = "A high performance JSON library written in ANSI C."
2HOMEPAGE = "https://github.com/ibireme/yyjson"
3
4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://LICENSE;md5=c8ae1b99922935413d4c596f50b59545"
6
7SRC_URI = "git://github.com/ibireme/yyjson.git;protocol=https;branch=master;tag=${PV}"
8SRCREV = "9e24d6bcead647231f81173cc5c6bb6c097c00e4"
9
10
11inherit cmake
12
13PACKAGECONFIG ??= "reader writer utils fast-fp-conv non-standard utf8-validation unaligned-memory-access"
14PACKAGECONFIG[reader] = "-DYYJSON_DISABLE_READER=OFF,-DYYJSON_DISABLE_READER=ON"
15PACKAGECONFIG[writer] = "-DYYJSON_DISABLE_WRITER=OFF,-DYYJSON_DISABLE_WRITER=ON"
16PACKAGECONFIG[utils] = "-DYYJSON_DISABLE_UTILS=OFF,-DYYJSON_DISABLE_UTILS=ON"
17PACKAGECONFIG[fast-fp-conv] = "-DYYJSON_DISABLE_FAST_FP_CONV=OFF,-DYYJSON_DISABLE_FAST_FP_CONV=ON"
18PACKAGECONFIG[non-standard] = "-DYYJSON_DISABLE_NON_STANDARD=OFF,-DYYJSON_DISABLE_NON_STANDARD=ON"
19PACKAGECONFIG[utf8-validation] = "-DYYJSON_DISABLE_UTF8_VALIDATION=OFF,-DYYJSON_DISABLE_UTF8_VALIDATION=ON"
20PACKAGECONFIG[unaligned-memory-access] = "-DYYJSON_DISABLE_UNALIGNED_MEMORY_ACCESS=OFF,-DYYJSON_DISABLE_UNALIGNED_MEMORY_ACCESS=ON"
21
22EXTRA_OECMAKE:append = " \
23-DBUILD_SHARED_LIBS=ON \
24-DYYJSON_BUILD_TESTS=OFF \
25-DYYJSON_BUILD_FUZZER=OFF \
26-DYYJSON_BUILD_MISC=OFF \
27-DYYJSON_BUILD_DOC=OFF \
28-DYYJSON_ENABLE_COVERAGE=OFF \
29-DYYJSON_ENABLE_VALGRIND=OFF \
30-DYYJSON_ENABLE_SANITIZE=OFF \
31-DYYJSON_ENABLE_FASTMATH=OFF \
32-DYYJSON_FORCE_32_BIT=OFF \
33"
diff --git a/meta-oe/recipes-support/zbar/zbar_git.bb b/meta-oe/recipes-support/zbar/zbar_git.bb
index 975779cd18..053e0161d7 100644
--- a/meta-oe/recipes-support/zbar/zbar_git.bb
+++ b/meta-oe/recipes-support/zbar/zbar_git.bb
@@ -15,7 +15,6 @@ SRC_URI = "git://github.com/mchehab/zbar.git;branch=master;protocol=https \
15" 15"
16SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37" 16SRCREV = "89e7900d85dd54ef351a7ed582aec6a5a5d7fa37"
17 17
18S = "${WORKDIR}/git"
19PV = "0.23.1+git" 18PV = "0.23.1+git"
20 19
21DEPENDS += "xmlto-native" 20DEPENDS += "xmlto-native"
diff --git a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb b/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb
index 0c8a9c7a5f..9ef380005c 100644
--- a/meta-oe/recipes-support/zchunk/zchunk_1.4.0.bb
+++ b/meta-oe/recipes-support/zchunk/zchunk_1.5.1.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=daf6e68539f564601a5a5869c31e5242"
5 5
6SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main" 6SRC_URI = "git://github.com/zchunk/zchunk.git;protocol=https;branch=main"
7 7
8SRCREV = "4dd91d31157ede4a1b092721d944ae2fdd161cd9" 8SRCREV = "69dd7d6764e333413dd12848607d72cab310e406"
9S = "${WORKDIR}/git"
10 9
11DEPENDS = "zstd" 10DEPENDS = "zstd"
12DEPENDS:append:libc-musl = " argp-standalone" 11DEPENDS:append:libc-musl = " argp-standalone"
diff --git a/meta-oe/recipes-support/zile/zile_2.4.15.bb b/meta-oe/recipes-support/zile/zile_2.4.15.bb
index e86b3f82d2..d7973ab861 100644
--- a/meta-oe/recipes-support/zile/zile_2.4.15.bb
+++ b/meta-oe/recipes-support/zile/zile_2.4.15.bb
@@ -9,7 +9,6 @@ SRC_URI = "${GNU_MIRROR}/zile/${BP}.tar.gz \
9 file://remove-help2man.patch \ 9 file://remove-help2man.patch \
10" 10"
11 11
12SRC_URI[md5sum] = "05efa90dfee1821ca018b0b2ef8f50a8"
13SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e" 12SRC_URI[sha256sum] = "39c300a34f78c37ba67793cf74685935a15568e14237a3a66fda8fcf40e3035e"
14 13
15inherit autotools pkgconfig 14inherit autotools pkgconfig