diff options
Diffstat (limited to 'meta-openembedded')
1022 files changed, 12645 insertions, 10155 deletions
diff --git a/meta-openembedded/README.md b/meta-openembedded/README.md index 7318f09cdb..82f2e9699a 100644 --- a/meta-openembedded/README.md +++ b/meta-openembedded/README.md @@ -1,6 +1,6 @@ Collection of layers for the OE-core universe -Main layer maintainer: Khem Raj <raj.khem@gmail.com> +Main layer maintainer: Armin Kuster <akuster808@gmail.com> This repository is a collection of layers to suppliment OE-Core with additional packages, Each layer have designated maintainer diff --git a/meta-openembedded/meta-filesystems/README.md b/meta-openembedded/meta-filesystems/README.md index 78a4429ce2..c04e2cc767 100644 --- a/meta-openembedded/meta-filesystems/README.md +++ b/meta-openembedded/meta-filesystems/README.md @@ -11,26 +11,26 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: styhead URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: styhead Patches ======= Please submit any patches against the filesystems layer to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) -with '[meta-filesystems]' in the subject. +with '[meta-filesystems][styhead]' in the subject. -Layer maintainer: Khem Raj <raj.khem@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-filesystems][PATCH' + --subject-prefix='meta-filesystems][styhead][PATCH' Table of Contents diff --git a/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc b/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc index 4975593277..509907d889 100644 --- a/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc +++ b/meta-openembedded/meta-filesystems/conf/include/non-repro-meta-filesystems.inc @@ -3,7 +3,4 @@ KNOWN_NON_REPRO_META_FILESYSTEMS = " \ e2tools-ptest \ xfsprogs-doc \ - zfs \ - zfs-dbg \ - zfs-dev \ " diff --git a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb index d3ea6797e7..504fe28923 100644 --- a/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.2.bb +++ b/meta-openembedded/meta-filesystems/recipes-filesystems/zfs/zfs_2.2.5.bb @@ -4,7 +4,7 @@ LICENSE = "CDDL-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7087caaf1dc8a2856585619f4a787faa" HOMEPAGE ="https://github.com/openzfs/zfs" -SRCREV = "494aaaed89cb9fe9f2da3b6c6f465a4bc9f6a7e1" +SRCREV = "33174af15112ed5c53299da2d28e763b0163f428" SRC_URI = "git://github.com/openzfs/zfs;protocol=https;branch=zfs-2.2-release \ file://0001-Define-strndupa-if-it-does-not-exist.patch \ file://aaf28a4630af60496c9d33db1d06a7d7d8983422.patch \ @@ -35,7 +35,7 @@ EXTRA_OECONF:append = " \ --with-systemdgeneratordir=${nonarch_base_libdir}/systemd/system-generators \ --with-systemdpresetdir=${nonarch_base_libdir}/systemd/system-preset \ --with-systemdmodulesloaddir=${sysconfdir}/module-load.d \ - --without-dracutdir \ + --without-dracutdir --enable-linux-builtin \ " EXTRA_OEMAKE:append = " \ diff --git a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb index 6f613e9cd1..fca7d42b39 100644 --- a/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb +++ b/meta-openembedded/meta-filesystems/recipes-support/fuse/fuse_2.9.9.bb @@ -23,7 +23,7 @@ SRC_URI[sha256sum] = "d0e69d5d608cc22ff4843791ad097f554dd32540ddc9bed7638cc6fea7 UPSTREAM_CHECK_URI = "https://github.com/libfuse/libfuse/releases" UPSTREAM_CHECK_REGEX = "fuse\-(?P<pver>2(\.\d+)+).tar.gz" -CVE_PRODUCT = "fuse_project:fuse" +CVE_PRODUCT = "fuse_project:fuse fuse:fuse" inherit autotools pkgconfig update-rc.d systemd diff --git a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb index 1fa5e01874..459c7058e1 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/e2tools_git.bb @@ -15,6 +15,7 @@ PV = "0.1.0+git" SRC_URI = " \ git://github.com/e2tools/e2tools;protocol=https;branch=master \ + file://0001-Disable-portability-warning-as-error.patch \ file://run-ptest \ " @@ -24,41 +25,14 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig ptest -do_configure:prepend() { - git -C "${WORKDIR}/git" reset --hard HEAD - - # To install ptest for this package, special configuration needs to be - # done before do_configure(). So, do_configure_ptest() which is scheduled - # after do_configure() cannot be used. - - # We only do special configuration if we are installing ptest for this - # package. - if [ "${@d.getVar('PTEST_ENABLED')}" -eq "1" ]; then - # Since we guarantee run-time dependency when installing the ptest for - # this package, we do not need the check macros under section "checks - # for programs" in "configure.ac". Plus, these check macros set the - # ouput variables to incorrect values as these checks are performed on - # the host environment. Still, we need these variables outputted from - # these check macros. So, we insert the following lines to manually - # set these output variables to the correct value in "configure.ac". - - # Note that HAVE_DD_COMMAND and HAVE_MKE2FS_COMMAND are only ever used - # in tests/Makefile-files which determines whether to include the test - # cases. As for output variables CHMOD, DD, and MKE2FS, they only - # point to the programs which test cases need to run. Since these - # commands are guaranteed to be present due to RDEPENDS and are - # guaranteed to be accessible under PATH environment variable on the - # target, we only need to specify the name of these programs. - - perl -i -0777 -pe 's/(^dnl\s*=+\s*^dnl\s*Checks for compiler flags\s*^dnl\s*=+)/ -AC_SUBST([CHMOD], 'chmod') -AC_SUBST([DD], 'dd') -AC_SUBST([MKE2FS], 'mke2fs') -AM_CONDITIONAL([HAVE_DD_COMMAND], [true]) -AM_CONDITIONAL([HAVE_MKE2FS_COMMAND], [true]) -\1/ms' "${WORKDIR}/git/configure.ac" - fi -} +# Otherwise these tools will be detected from build host and +# assumptions will go wrong, Fun of cross compiling +EXTRA_OECONF += "\ + ac_cv_path_MKE2FS=${base_sbindir}/mke2fs \ + ac_cv_path_CHMOD=${base_bindir}/chmod \ + ac_cv_path_DD=${base_bindir}/dd \ + ac_cv_path_GREP=${base_bindir}/grep \ + " do_install_ptest() { rm -rf "${D}${PTEST_PATH}/*" @@ -67,7 +41,7 @@ do_install_ptest() { cp -r "${S}" "${D}${PTEST_PATH}" rm -rf ${D}${PTEST_PATH}/build/config.log ${D}${PTEST_PATH}/build/autom4te.cache \ ${D}${PTEST_PATH}/git/.git ${D}${PTEST_PATH}/git/autom4te.cache - sed -i -e 's;${RECIPE_SYSROOT};;g' ${D}${PTEST_PATH}/build/config.status + sed -i -e 's;${TMPDIR};;g' ${D}${PTEST_PATH}/build/config.status } RDEPENDS:${PN}-ptest += "bash coreutils e2fsprogs e2tools gawk make perl" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch new file mode 100644 index 0000000000..dec793f373 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/e2tools/files/0001-Disable-portability-warning-as-error.patch @@ -0,0 +1,34 @@ +From e0aaedea30483bf5b9bb085e12fff79144fa1174 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2024 11:12:57 -0700 +Subject: [PATCH] Disable portability warning as error + +With latest automake 1.17 its warning about escape hash +mark [1] and since configure.ac uses -werror to call automake +this becomes an error and reconfigure fails. + +escape hash mark is non-portable as discussed here [2] + +Fow now let it be a warning, it should be fixed in a portable way + +[1] https://debbugs.gnu.org/cgi/bugreport.cgi?bug=7610 +[2] https://lists.gnu.org/archive/html/automake/2011-08/msg00023.html + +Upstream-Status: Submitted [https://github.com/e2tools/e2tools/pull/31] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/configure.ac b/configure.ac +index dd32c4d..9f37591 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,6 +14,7 @@ AC_CONFIG_MACRO_DIR([m4]) + AM_INIT_AUTOMAKE([ + -Wall + -Werror ++-Wno-portability + 1.9.6 + foreign + subdir-objects diff --git a/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb b/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.5.bb index aa6a199784..c3ae8b8381 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.4.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/exfatprogs/exfatprogs_1.2.5.bb @@ -12,7 +12,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "ad38126dfd9f74f8c6ecb35ddfd34d2582601d6c3ff26756610b8418360c8ee2" +SRC_URI[sha256sum] = "f27160dcc1ddd17c96cd41a6ceef7037adc2796ab5c5633d3d85cf532c3ee2f0" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch new file mode 100644 index 0000000000..78802e39ab --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0001-always-use-glibc-basename.patch @@ -0,0 +1,38 @@ +From 2fa94fc7adf05fae46204f4665216c8b019010f3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Jul 2024 23:16:38 -0700 +Subject: [PATCH 1/2] always use glibc basename() + +There is a use of basename() which expects it to be GNU version of +basename, which is not available in other libcs e.g. musl on Linux +therefore provide a version for such cases + +Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + main.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/main.c b/main.c +index 7b669eb..ea0f5a5 100644 +--- a/main.c ++++ b/main.c +@@ -30,6 +30,18 @@ bool brief; + bool ignore; + extern char *program_name; + ++#ifndef __GLIBC__ ++/* ++ * GNU basename implementation ++ */ ++static const char *__basename(const char *filename) { ++ char *p = strrchr(filename, '/'); ++ return p ? p + 1 : filename; ++} ++ ++#define basename(x) __basename(x) ++#endif ++ + void print_help(const char *program) { + printf("Usage: %s command options\n", program); + puts(""); diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch new file mode 100644 index 0000000000..845306292e --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools/0002-Change-program_name-to-have-const-attribute.patch @@ -0,0 +1,56 @@ +From be694ba90aa2e0fed3a4e9b53ad7a61efd0430c5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 5 Jul 2024 23:18:07 -0700 +Subject: [PATCH 2/2] Change program_name to have const attribute + +This is how it is used in all places and it also avoids a const to +non-const conversion warning + +Upstream-Status: Submitted [https://github.com/kmxz/overlayfs-tools/pull/26] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + common.c | 2 +- + fsck.c | 2 +- + main.c | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/common.c b/common.c +index eaf24a8..a15b66f 100644 +--- a/common.c ++++ b/common.c +@@ -29,7 +29,7 @@ + #include "common.h" + #include "config.h" + +-char *program_name; ++const char *program_name; + + /* #define DEBUG 1 */ + #ifdef DEBUG +diff --git a/fsck.c b/fsck.c +index 4e513f5..285b9f1 100644 +--- a/fsck.c ++++ b/fsck.c +@@ -46,7 +46,7 @@ + #include "mount.h" + #include "overlayfs.h" + +-extern char *program_name; ++extern const char *program_name; + + struct ovl_fs ofs = {}; + int flags = 0; /* user input option flags */ +diff --git a/main.c b/main.c +index ea0f5a5..1a8b239 100644 +--- a/main.c ++++ b/main.c +@@ -28,7 +28,7 @@ + bool verbose; + bool brief; + bool ignore; +-extern char *program_name; ++extern const char *program_name; + + #ifndef __GLIBC__ + /* diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb deleted file mode 100644 index 47613207af..0000000000 --- a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_git.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Maintenance tools for OverlayFS" -HOMEPAGE = "https://github.com/kmxz/overlayfs-tools" -LICENSE = "WTFPL" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" - -SRC_URI = "\ - git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ -" - -PV = "1.0+git" -SRCREV = "b5e5a829895ac98ccfe4629fbfbd8b819262bd00" - -S = "${WORKDIR}/git" -B = "${S}" - -# Required to have the fts.h header for musl -DEPENDS:append:libc-musl = " fts" - -EXTRA_OEMAKE += "'CC=${CC} -O2'" -# Fix the missing fts libs when using musl -EXTRA_OEMAKE:append:libc-musl = " LDLIBS=-lfts" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install () { - install -d ${D}${bindir} - install -m 0755 ${B}/overlay ${D}${bindir} - install -m 0755 ${B}/fsck.overlay ${D}${bindir} -} diff --git a/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb new file mode 100644 index 0000000000..d11ee0c479 --- /dev/null +++ b/meta-openembedded/meta-filesystems/recipes-utils/overlayfs/overlayfs-tools_v2024.07.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Maintenance tools for OverlayFS" +HOMEPAGE = "https://github.com/kmxz/overlayfs-tools" +LICENSE = "WTFPL" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=f312a7c4d02230e8f2b537295d375c69" + +SRC_URI = "\ + git://github.com/kmxz/overlayfs-tools.git;protocol=https;branch=master \ + file://0001-always-use-glibc-basename.patch \ + file://0002-Change-program_name-to-have-const-attribute.patch \ +" + +SRCREV = "7a4a0c4f2c6c86aa46a40e3468e394fd4a237491" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +DEPENDS:append:libc-musl = " fts" diff --git a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb index 9c0394918e..c65344f536 100644 --- a/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.1.12.bb +++ b/meta-openembedded/meta-filesystems/recipes-utils/xfsdump/xfsdump_3.2.0.bb @@ -15,7 +15,7 @@ SRC_URI = "https://www.kernel.org/pub/linux/utils/fs/xfs/xfsdump/${BP}.tar.xz \ file://0001-include-libgen.h-for-basename-API-prototype.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-xfsdump-support-usrmerge.patch','',d)} \ " -SRC_URI[sha256sum] = "f39c4c1b306b2dd7ec979c0e94d60fe69083d2ecf9af051cac5ef3bed772c74a" +SRC_URI[sha256sum] = "2914dbbe1ebc88c7d93ad88e220aa57dabc43d216e11f06221c01edf3cc10732" inherit autotools-brokensep diff --git a/meta-openembedded/meta-gnome/README.md b/meta-openembedded/meta-gnome/README.md index fbb0d72476..3011358389 100644 --- a/meta-openembedded/meta-gnome/README.md +++ b/meta-openembedded/meta-gnome/README.md @@ -3,14 +3,14 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: styhead URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: styhead -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-gnome][styhead]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-gnome][styhead][PATCH' -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb b/meta-openembedded/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb index 59ae9383db..a16a02aa7b 100644 --- a/meta-openembedded/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb +++ b/meta-openembedded/meta-gnome/dynamic-layers/meta-security/recipes-gnome/gnome-remote-desktop/gnome-remote-desktop_46.2.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gettext gsettings features_check useradd +inherit gnomebase gettext gsettings features_check REQUIRED_DISTRO_FEATURES = "opengl polkit" @@ -36,15 +36,5 @@ PACKAGECONFIG[vnc] = "-Dvnc=true,-Dvnc=false,libvncserver" PACKAGECONFIG[rdp] = "-Drdp=true,-Drdp=false,freerdp3 fuse3 libxkbcommon" PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" - -do_install:append() { - if [ -d ${D}${datadir}/polkit-1/rules.d ]; then - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi -} - PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" FILES:${PN} += "${systemd_user_unitdir} ${systemd_system_unitdir} ${datadir} ${libdir}/sysusers.d ${libdir}/tmpfiles.d" diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch new file mode 100644 index 0000000000..8162e50d9b --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-application-client.vala-hardcode-some-paths.patch @@ -0,0 +1,40 @@ +From 98243ca43e40116c22f7b867e32ad27ffd314505 Mon Sep 17 00:00:00 2001 +From: Markus Volk <f_l_k@t-online.de> +Date: Tue, 16 Jul 2024 07:30:09 +0200 +Subject: [PATCH] application-client.vala: hardcode some paths + +Otherwise the build values will be stored in the binary and used if geary was not installed +https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L798 +https://gitlab.gnome.org/GNOME/geary/-/blob/main/src/client/application/application-client.vala?ref_type=heads#L365 + +This breaks reproducibility +WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/libgeary-client-46.0.so in package geary contains reference to TMPDIR [buildpaths] +WARNING: geary-46.0-r0 do_package_qa: QA Issue: File /usr/lib/geary/.debug/libgeary-client-46.0.so in package geary-dbg contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + src/client/application/application-client.vala | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/client/application/application-client.vala b/src/client/application/application-client.vala +index 51d0f632e..acc53a65f 100644 +--- a/src/client/application/application-client.vala ++++ b/src/client/application/application-client.vala +@@ -39,9 +39,9 @@ public class Application.Client : Gtk.Application { + + public const string VERSION = _VERSION; + public const string INSTALL_PREFIX = _INSTALL_PREFIX; +- public const string GSETTINGS_DIR = _GSETTINGS_DIR; +- public const string SOURCE_ROOT_DIR = _SOURCE_ROOT_DIR; +- public const string BUILD_ROOT_DIR = _BUILD_ROOT_DIR; ++ public const string GSETTINGS_DIR = "/usr/share/applications"; ++ public const string SOURCE_ROOT_DIR = "/usr/src"; ++ public const string BUILD_ROOT_DIR = "/usr/src"; + + // keep these in sync with meson_options.txt + public const string PROFILE_RELEASE = "release"; +-- +2.45.2 + diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch deleted file mode 100644 index 1e0640a666..0000000000 --- a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary/0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a300be5877f35379bb569313eec901bda9c8d762 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 30 Apr 2023 22:08:39 -0700 -Subject: [PATCH] meson: Use PKG_CONFIG_SYSROOT_DIR when using pkg-config - -OE cross-builds and absolute paths found by pkg-config points to -non-sysroot'ed locations which are not correct as they point into native -sysroot from build machine which is incorrect. - -Upstream-Status: Inappropriate [OE-specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - meson.build | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/meson.build b/meson.build -index d563dd08..9b72aeb4 100644 ---- a/meson.build -+++ b/meson.build -@@ -38,6 +38,9 @@ metadata_dir = meson.project_source_root() / 'bindings'/ 'metadata' - po_dir = meson.project_source_root() / 'po' - vapi_dir = meson.project_source_root() / 'bindings' / 'vapi' - -+# pkg-config sysroot location -+pkgconf_sysroot = run_command('python3', '-c', 'import os; print(os.environ.get("PKG_CONFIG_SYSROOT_DIR"))').stdout().strip() -+ - # Compiler configuration - add_project_arguments([ - # Make sure Meson can find custom VAPIs -@@ -120,7 +123,7 @@ icu_uc = declare_dependency( - if libunwind_dep.found() - # We need to add native lib to the search path for these so Flatpak - # builds can find it. -- unwind_lib = libunwind_dep.get_variable(pkgconfig: 'libdir') -+ unwind_lib = pkgconf_sysroot + libunwind_dep.get_variable(pkgconfig: 'libdir') - libunwind = declare_dependency( - dependencies: [ - valac.find_library('libunwind', dirs: [vapi_dir, unwind_lib]), -@@ -207,8 +210,7 @@ vala_unit_proj = subproject( - vala_unit_dep = vala_unit_proj.get_variable('vala_unit_dep') - - # Language detection -- --iso_codes_dir = iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' -+iso_codes_dir = pkgconf_sysroot + iso_codes.get_variable(pkgconfig: 'prefix')/'share'/'xml'/'iso-codes' - - iso_639_xml = get_option('iso_639_xml') - if iso_639_xml == '' --- -2.40.1 - diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_44.1.bb b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_46.0.bb index decae6b2c7..d8d48ef513 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_44.1.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/geary/geary_46.0.bb @@ -23,6 +23,7 @@ DEPENDS = " \ libical \ libpeas \ libsecret \ + libsoup \ libstemmer \ libxml2 \ sqlite3 \ @@ -31,15 +32,15 @@ DEPENDS = " \ RDEPENDS:${PN} = "gnome-keyring" -inherit meson pkgconfig mime-xdg gtk-icon-cache gobject-introspection vala features_check +inherit meson pkgconfig mime-xdg gsettings gtk-icon-cache gobject-introspection vala features_check SRC_URI = " \ git://github.com/GNOME/geary.git;nobranch=1;protocol=https \ - file://0001-meson-Use-PKG_CONFIG_SYSROOT_DIR-when-using-pkg-conf.patch \ + file://0001-application-client.vala-hardcode-some-paths.patch \ " S = "${WORKDIR}/git" -SRCREV = "37c378a563d5b1c269d57c34671edc940d1cd180" +SRCREV = "46e93c0c0dafc381e8a308b1befb07e908121722" ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "gobject-introspection-data opengl" @@ -52,10 +53,6 @@ PACKAGECONFIG[tnef] = "-Dtnef=enabled,-Dtnef=disabled,libytnef" PACKAGECONFIG[valadoc] = "-Dvaladoc=enabled,-Dvaladoc=disabled" PACKAGECONFIG ??= "" -# rfc822/rfc822-message.c:2097:12: error: incompatible pointer to integer conversion returning 'void *' from a function with result type 'gboolean' (aka 'int') [-Wint-conversion] -#| return NULL; -#| ^~~~ -CFLAGS:append:toolchain-clang = " -Wno-error=int-conversion" FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb index 833341f850..a17e03b103 100644 --- a/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb +++ b/meta-openembedded/meta-gnome/recipes-gimp/gimp/gimp_2.10.38.bb @@ -73,3 +73,8 @@ do_compile:prepend() { FILES:${PN} += "${datadir}/metainfo" RDEPENDS:${PN} += "mypaint-brushes-1.0" + +CVE_STATUS[CVE-2007-3741] = "not-applicable-platform: This only applies for Mandriva Linux" +CVE_STATUS[CVE-2009-0581] = "cpe-incorrect: The current version (2.10.38) is not affected." +CVE_STATUS[CVE-2009-0723] = "cpe-incorrect: The current version (2.10.38) is not affected." +CVE_STATUS[CVE-2009-0733] = "cpe-incorrect: The current version (2.10.38) is not affected." diff --git a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.3.bb b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_47.0.bb index 00fe266698..8e0583cf91 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_45.3.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/eog/eog_47.0.bb @@ -21,7 +21,7 @@ inherit gnomebase pkgconfig gsettings gobject-introspection gettext mime-xdg fea # FIXME: whilst eog uses libpeas <2, g-i is needed. This can be removed when libpeas2 is used. REQUIRED_DISTRO_FEATURES = "opengl gobject-introspection-data" -SRC_URI[archive.sha256sum] = "8650f662d4921d83a7904f6bb9ca245baf735f717b47fac5b37f0d90e5e891a8" +SRC_URI[archive.sha256sum] = "db5edbf5224d75126a7b7d8ee4e9272a2f30a953331d5baf6d3f3c0ce0cbde66" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.3.bb index 8fd6583104..83bc9c6ad8 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.3.bb @@ -8,7 +8,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc python3native vala -SRC_URI[archive.sha256sum] = "2a0c9cf48fbe8b3435008866ffd40b8eddb0667d2212b42396fdf688e93ce0be" +SRC_URI[archive.sha256sum] = "21e64d2c56e9b333d44fef3f2a4b25653d922c419acd972fa96fab695217e2c8" EXTRA_OEMESON = " \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)} \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb index 8d602eee44..d7325888d6 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.4.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.5.bb @@ -13,7 +13,7 @@ GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc vala -SRC_URI[archive.sha256sum] = "c0afbe333bcf3cb1441a1f574cc8ec7b1b8197779145d4edeee2896fdacfc3c2" +SRC_URI[archive.sha256sum] = "838c5306fc38bfaa2f23abe24262f4bf15771e3303fb5dcb74f5b9c7a615dabe" do_compile:prepend() { export GIR_EXTRA_LIBS_PATH="${B}/gnome-autoar/.libs" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb index d938ae94cb..8774750e95 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_47.0.bb @@ -6,7 +6,7 @@ SECTION = "x11/gnome" inherit gnomebase gettext allarch -SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e" +SRC_URI[archive.sha256sum] = "874a4a39c4261736f6a854722833400b612441c4681aa5982d90b15abc9c91fd" FILES:${PN} += " \ ${datadir}/backgrounds \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.1.bb index 1b29e52c75..980ff36782 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.1.bb @@ -25,7 +25,7 @@ inherit features_check gnomebase gtk-icon-cache gtk-doc gobject-introspection REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI[archive.sha256sum] = "13fe1e75f317acdbdf5e80c9029d2e0632d60a9ccf72a43ae36eb7545021fbef" +SRC_URI[archive.sha256sum] = "56c44a17034598e9607458afae1be75f3de5efdf0e62355f09ba58fc7bc312ac" BT_PULSE_PACKS = " \ pulseaudio-lib-bluez5-util \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb index bb53b58df7..e3365f6181 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-chess/gnome-chess_47.0.bb @@ -22,13 +22,13 @@ DEPENDS = " \ RRECOMMENDS:${PN} = "gnuchess" -SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=master" +SRC_URI = "git://github.com/GNOME/gnome-chess.git;protocol=https;branch=main" inherit meson pkgconfig gobject-introspection gtk-icon-cache vala features_check mime-xdg gsettings GIR_MESON_OPTION = "" S = "${WORKDIR}/git" -SRCREV = "c3625ee59ab3acfd7566ef04300b15ddbadaaac3" +SRCREV = "91476257c2404945bfa30238c38391343bf4737b" FILES:${PN} += "${datadir}" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb index 152e803b5d..ae96caf94f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.2.bb @@ -33,7 +33,7 @@ DEPENDS = " \ upower \ " -inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check useradd +inherit gtk-icon-cache pkgconfig gnomebase gsettings gettext upstream-version-is-even bash-completion features_check REQUIRED_DISTRO_FEATURES += "opengl polkit pulseaudio systemd x11" @@ -52,16 +52,6 @@ EXTRA_OEMESON += "-Doe_sysroot=${STAGING_DIR_HOST}" export XDG_DATA_DIRS = "${STAGING_DATADIR}" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" - -do_install:append() { - if [ -d ${D}${datadir}/polkit-1/rules.d ]; then - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi -} - PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" FILES:${PN} += " \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb index 19bae74ce2..63847fe3e5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.1.bb @@ -15,7 +15,7 @@ GIR_MESON_OPTION = "" SRC_URI += "file://gnome-desktop-thumbnail-don-t-assume-time_t-is-long.patch \ file://0001-meson-Add-riscv32-to-seccomp-unsupported-list.patch" -SRC_URI[archive.sha256sum] = "42c773745d84ba14bc1cf1c4c6f4606148803a5cd337941c63964795f3c59d42" +SRC_URI[archive.sha256sum] = "ae7ca55dc9e08914999741523a17d29ce223915626bd2462a120bf96f47a79ab" DEPENDS += " \ fontconfig \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb index e4998f6276..6f910c4c13 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.1.bb @@ -29,7 +29,7 @@ PACKAGECONFIG[systemd] = "-Dlogind=libsystemd,-Dlogind=none,systemd" PACKAGECONFIG[x11] = ",,libcanberra" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-gnome-disk-utility-remove-libcanberra-dependency.patch', '', d)}" -SRC_URI[archive.sha256sum] = "464649148c6d6771f1ac2ebfe43a4e519205b11c2d914a09f2a001821d06957d" +SRC_URI[archive.sha256sum] = "c24e9439a04d70bcfae349ca134c7005435fe2b6f452114df878bff0b89bbffe" EXTRA_OEMESON = "-Dman=false" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch deleted file mode 100644 index be4c002fc3..0000000000 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer/0001-window-Fix-function-callback-definition.patch +++ /dev/null @@ -1,43 +0,0 @@ -From ac4a07e7ef3d9d046a4ca2a803c5b649b6f7ddf4 Mon Sep 17 00:00:00 2001 -From: Matt Turner <mattst88@gmail.com> -Date: Sat, 8 Jul 2023 00:01:07 -0400 -Subject: [PATCH] window: Fix function callback definition - -Without this, the build fails with clang with -CFLAGS=-Werror=incompatible-function-pointer-types - -``` -../src/font-view-window.c:864:77: error: incompatible function pointer types passing 'void (FontViewWindow *)' (aka 'void (struct _FontViewWindow *)') to parameter of type 'GtkWidgetActionActivateFunc' (aka 'void (*)(struct _GtkWidget *, const char *, struct _GVariant *)') [-Wincompatible-function-pointer-types] - gtk_widget_class_install_action (widget_class, "win.toggle-search", NULL, action_toggle_search_cb); - ^~~~~~~~~~~~~~~~~~~~~~~ -/usr/include/gtk-4.0/gtk/gtkwidget.h:956:87: note: passing argument to parameter 'activate' here - GtkWidgetActionActivateFunc activate); - ^ -``` - -Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/merge_requests/54] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/font-view-window.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/src/font-view-window.c b/src/font-view-window.c -index 639ac33..24461f7 100644 ---- a/src/font-view-window.c -+++ b/src/font-view-window.c -@@ -758,8 +758,11 @@ font_view_window_show_overview (FontViewWindow *self) - } - - static void --action_toggle_search_cb (FontViewWindow *self) -+action_toggle_search_cb (GtkWidget *widget, -+ const char *action_name, -+ GVariant *parameter) - { -+ FontViewWindow *self = FONT_VIEW_WINDOW (widget); - - gtk_toggle_button_set_active (self->search_button, - !gtk_toggle_button_get_active (self->search_button)); --- -2.45.1 - diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb index ccf8262dcd..4763d1717d 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-font-viewer/gnome-font-viewer_47.0.bb @@ -15,8 +15,7 @@ inherit gnomebase gtk-icon-cache gettext features_check mime-xdg REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRC_URI += "file://0001-window-Fix-function-callback-definition.patch" -SRC_URI[archive.sha256sum] = "592f401e485d02cc044d487bb5c8e04c961da6856216768a59f1ff98bd2d537c" +SRC_URI[archive.sha256sum] = "b8e5a042e0b241b0c7cae43f74da0d5f88e6423017a91feb86e7617edb4080ed" FILES:${PN} += " \ ${datadir}/dbus-1 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb index 8df3710e6a..e173199088 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-keyring/gnome-keyring_46.2.bb @@ -22,7 +22,7 @@ inherit gnomebase gsettings features_check gettext ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI[archive.sha256sum] = "b1d3ae9132ff2f8b3f25a190790892968e3d0acf952a487e40f644a8550ce3f6" +SRC_URI[archive.sha256sum] = "bf26c966b8a8b7f3285ecc8bb3e467b9c20f9535b94dc451c9c559ddcff61925" SRC_URI += " \ file://0001-Set-paths-to-ssh-agent-and-ssh-add-by-configure-opti.patch \ file://musl.patch \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb index 0a52de7a3b..e166db0a6a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.2.bb @@ -13,6 +13,7 @@ DEPENDS = " \ gjs \ gnome-autoar \ gnome-desktop \ + gnome-control-center \ polkit \ pipewire \ libsoup-3.0 \ diff --git a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb index 14e1ca9fe1..b6ac75dd8a 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/grilo/grilo_0.3.16.bb @@ -26,5 +26,14 @@ PACKAGECONFIG[test-ui] = "-Denable-test-ui=true, -Denable-test-ui=false, gtk+3 l EXTRA_OEMESON = "-Denable-grl-pls=false" do_compile:append() { - sed -i -e 's,${B}/../,,' ${B}/src/grl-type-builtins.h + # grl-type-builtins.* are generated by glib-mkenums which leave full paths + # in comment and #include directives. Rewrite those before *-src packaging. + + # Path can be relative to B or WORKDIR in devtool modify + for base in ${B} ${WORKDIR} ; do + relpath="$(realpath --relative-to="$base" "${S}")" + sed -i -e "s,$base/$relpath/src/,," \ + ${B}/src/grl-type-builtins.h \ + ${B}/src/grl-type-builtins.c + done } diff --git a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb index 01cdb4eef5..6549b1900f 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb @@ -2,7 +2,7 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd +inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check DEPENDS += "\ dbus \ @@ -77,16 +77,7 @@ PACKAGECONFIG[fuse] = "-Dfuse=true, -Dfuse=false, fuse3" # libcdio-paranoia recipe doesn't exist yet PACKAGECONFIG[cdda] = "-Dcdda=true, -Dcdda=false, libcdio-paranoia" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" - do_install:append() { - if ${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'true', 'false', d)}; then - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}${datadir}/polkit-1/rules.d - chown polkitd:root ${D}${datadir}/polkit-1/rules.d - fi - # After rebuilds (not from scracth) it can happen that the executables in # libexec ar missing executable permission flag. Not sure but it came up # during transition to meson. Looked into build files and logs but could diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch new file mode 100644 index 0000000000..08ff51205a --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf/0001-Compilation-attempt-fixes-for-libxml-2.13.patch @@ -0,0 +1,105 @@ +From 4a84e9857d83f684bf53d616942a393ce558a328 Mon Sep 17 00:00:00 2001 +From: Morten Welinder <terra@gnome.org> +Date: Wed, 3 Jul 2024 19:18:15 -0400 +Subject: [PATCH] Compilation: attempt fixes for libxml 2.13 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 1 + + gsf/gsf-input-http.c | 19 +++++++++++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/configure.ac b/configure.ac +index fceb776..7c2f946 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -238,6 +238,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gstdio.h>]], [[(void)g_chown("/ + AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) + AC_CHECK_FUNCS(g_date_time_new_from_iso8601 g_date_time_format_iso8601) ++AC_CHECK_FUNCS(xmlNanoHTTPOpen xmlNanoHTTPClose) + CFLAGS=$SAVE_CFLAGS + LIBS=$SAVE_LIBS + +diff --git a/gsf/gsf-input-http.c b/gsf/gsf-input-http.c +index bdde3c8..03f4045 100644 +--- a/gsf/gsf-input-http.c ++++ b/gsf/gsf-input-http.c +@@ -23,7 +23,10 @@ + #include <gsf/gsf-input-http.h> + #include <gsf/gsf.h> + ++#ifdef HAVE_XMLNANOHTTPOPEN ++// It's going away, so make it conditional + #include <libxml/nanohttp.h> ++#endif + + struct _GsfInputHTTP { + GsfInput input; +@@ -74,7 +77,9 @@ gsf_input_http_finalize (GObject *obj_input) + input->content_type = NULL; + + if (input->ctx) { ++#ifdef HAVE_XMLNANOHTTPCLOSE + xmlNanoHTTPClose ((gpointer) input->ctx); ++#endif + input->ctx = NULL; + } + +@@ -215,6 +220,7 @@ gsf_input_http_get_content_type (GsfInputHTTP *input) + return content_type; + } + ++#ifdef HAVE_XMLNANOHTTPOPEN + static GsfInput * + make_local_copy (gpointer *ctx) + { +@@ -254,6 +260,7 @@ make_local_copy (gpointer *ctx) + + return copy; + } ++#endif + + /** + * gsf_input_http_new: +@@ -265,6 +272,7 @@ make_local_copy (gpointer *ctx) + GsfInput * + gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + GObject *obj; + GsfInput *input; + gpointer ctx; +@@ -293,6 +301,10 @@ gsf_input_http_new (gchar const * url, GError **error G_GNUC_UNUSED) + GSF_INPUT_HTTP (obj)->ctx = ctx; + + return GSF_INPUT (obj); ++#else ++ g_return_val_if_fail(url != NULL, NULL); ++ return NULL; ++#endif + } + + static GsfInput * +@@ -304,6 +316,7 @@ gsf_input_http_dup (GsfInput *src, GError **err) + static guint8 const * + gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + { ++#ifdef HAVE_XMLNANOHTTPOPEN + int nread; + size_t total_read; + gpointer ctx = GSF_INPUT_HTTP (input)->ctx; +@@ -324,6 +337,12 @@ gsf_input_http_read (GsfInput *input, size_t num_bytes, guint8 *buffer) + return NULL; + } + return buffer; ++#else ++ (void)input; ++ (void)num_bytes; ++ (void)buffer; ++ return NULL; ++#endif + } + + static gboolean diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb index 7e1842b1ac..97cbbe450c 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/libgsf/libgsf_1.14.52.bb @@ -10,7 +10,8 @@ GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gobject-introspection gettext gtk-doc SRC_URI[archive.sha256sum] = "9181c914b9fac0e05d6bcaa34c7b552fe5fc0961d3c9f8c01ccc381fb084bcf0" -SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch" +SRC_URI += "file://0001-configure.ac-drop-a-copy-paste-of-introspection.m4-m.patch \ + file://0001-Compilation-attempt-fixes-for-libxml-2.13.patch" PACKAGECONFIG ??= "" PACKAGECONFIG[gdk-pixbuf] = "--with-gdk-pixbuf,--without-gdk-pixbuf,gdk-pixbuf" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb new file mode 100644 index 0000000000..f5f8a3321e --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/libspelling/libspelling_0.2.1.bb @@ -0,0 +1,13 @@ +SUMMARY = "A spellcheck library for GTK 4" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/libspelling" +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +DEPENDS = "enchant2 gtk4 gtksourceview5 icu" + +inherit gnomebase pkgconfig gettext gi-docgen vala gobject-introspection + +GIR_MESON_OPTION = '' +GIDOCGEN_MESON_OPTION = 'docs' + +SRC_URI[archive.sha256sum] = "7a787b467bd493f6baffb44138dbc4bef78aaab60efb76a7db88b243bf0f6343" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.3.bb index a4b4349500..f3f66c3dcf 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/msgraph/msgraph_0.2.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3000208d539ec061b899bce1d9ce9404" inherit gnomebase gobject-introspection gi-docgen features_check REQUIRED_DISTRO_FEATURES = "opengl" -SRC_URI[archive.sha256sum] = "12cc954f750bb137ace8500fe9355d26e6e00ef6ccaab2950e9d360e92758335" +SRC_URI[archive.sha256sum] = "ed42e800cb7f0a07477cd9e3e744cdc1a240a6ad7ab96b8a875806267a9fddb0" GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb index 6a121b09cf..c91744cf66 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_46.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/mutter/mutter_46.4.bb @@ -24,7 +24,7 @@ DEPENDS = " \ inherit gnomebase gsettings gobject-introspection gettext features_check -SRC_URI[archive.sha256sum] = "009baa77f8362612caa2e18c338a1b3c8aad3b5fe2964c2fef7824d321228983" +SRC_URI[archive.sha256sum] = "611bd9cf982adb56597ce2b34224272fda619bb3bb912a684d75c6f2c37502e4" # x11 is still manadatory - see meson.build REQUIRED_DISTRO_FEATURES = "wayland x11 polkit" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch new file mode 100644 index 0000000000..2dca95dac5 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch @@ -0,0 +1,27 @@ +From a3316e607db2a64e030df8551455c5700b5ddfcf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 25 Jul 2024 20:18:17 -0700 +Subject: [PATCH] libsysprof: Check for unw_set_caching_policy before using + +llvm libunwind does not implement unw_cache_* functions yet + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/libsysprof/preload/backtrace-helper.h | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/libsysprof/preload/backtrace-helper.h b/src/libsysprof/preload/backtrace-helper.h +index 88dc194..5c23ad3 100644 +--- a/src/libsysprof/preload/backtrace-helper.h ++++ b/src/libsysprof/preload/backtrace-helper.h +@@ -32,7 +32,9 @@ static void + backtrace_init (void) + { + #ifdef ENABLE_LIBUNWIND ++# ifdef UNW_CACHE_PER_THREAD + unw_set_caching_policy (unw_local_addr_space, UNW_CACHE_PER_THREAD); ++# endif + # ifdef HAVE_UNW_SET_CACHE_SIZE + unw_set_cache_size (unw_local_addr_space, 1024, 0); + #endif diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch index dc702a0e37..ea9bdb2eb5 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch @@ -6,22 +6,22 @@ Subject: [PATCH] meson: Check for libunwind instead of libunwind-generic This helps it to use llvm unwinder since libunwind-generic is specific to nongnu libunwind. -Upstream-Status: Pending +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/sysprof/-/merge_requests/95] Signed-off-by: Khem Raj <raj.khem@gmail.com> --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build -index 2835782..0fdb39a 100644 +index 3d3d8b5..4a1963d 100644 --- a/meson.build +++ b/meson.build -@@ -81,7 +81,7 @@ config_h.set10('HAVE_POLKIT_AGENT', polkit_agent_dep.found()) - config_h.set10('HAVE_POLKIT', polkit_dep.found()) - +@@ -96,7 +96,7 @@ config_h.set10('HAVE_POLKIT', polkit_dep.found()) if get_option('libunwind') -- libunwind_dep = dependency('libunwind-generic') -+ libunwind_dep = dependency('libunwind') + # Force libunwind usage if it's specified to avoid back compiles + # and backtrace() showing up in builds +- libunwind_dep = dependency('libunwind-generic', required: true) ++ libunwind_dep = dependency('libunwind', required: true) config_h.set('ENABLE_LIBUNWIND', libunwind_dep.found()) config_h.set('HAVE_UNW_SET_CACHE_SIZE', libunwind_dep.found() and cc.has_header_symbol('libunwind.h', 'unw_set_cache_size', dependencies: [libunwind_dep])) endif diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch new file mode 100644 index 0000000000..998c20c657 --- /dev/null +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof/0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch @@ -0,0 +1,32 @@ +From 9ad120283f4b61b97da67f18a95bb3b4f1e8a3b9 Mon Sep 17 00:00:00 2001 +From: Carlos Alberto Lopez Perez <clopez@igalia.com> +Date: Wed, 24 Jul 2024 15:51:05 +0100 +Subject: [PATCH] meson: Do not invoke the commands to update the icon caches + when cross-building + +This does not have any useful efect when cross-building and it requires +the cross-builder environment to have gtk4-native built in order to invoke +gtk-update-icon-cache program. + +Upstream-Status: Pending +Signed-off-by: Carlos Alberto Lopez Perez <clopez@igalia.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 3d3d8b5..da622f1 100644 +--- a/meson.build ++++ b/meson.build +@@ -250,7 +250,7 @@ configure_file( + configuration: config_h + ) + +-if get_option('gtk') and gnome.found() ++if get_option('gtk') and gnome.found() and not meson.is_cross_build() + gnome.post_install( + gtk_update_icon_cache: true, + update_desktop_database: true +-- +2.39.2 + diff --git a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.48.0.bb index 3523bad3e2..fccca1d8ff 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.44.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/sysprof/sysprof_3.48.0.bb @@ -14,19 +14,26 @@ DEPENDS += " \ json-glib \ " -SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch" -SRC_URI[archive.sha256sum] = "ab5d9f5b71973b3088d58a1bfdf1dc23c39a02f5fce4e5e9c73e034b178b005b" +SRC_URI += "file://0001-meson-Check-for-libunwind-instead-of-libunwind-gener.patch \ + file://0002-meson-Do-not-invoke-the-commands-to-update-the-icon-.patch \ + file://0001-libsysprof-Check-for-unw_set_caching_policy-before-u.patch \ + " +SRC_URI[archive.sha256sum] = "07d9081a66cf2fb52753f48ff2b85ada75c60ff1bc1af1bd14d8aeb627972168" -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd libsysprof', '', d)} \ +PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'polkit', 'sysprofd', '', d)} \ ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ - libunwind" + agent \ + libsysprof \ + libunwind \ + " # nongnu libunwind needs porting to RV32 PACKAGECONFIG:remove:riscv32 = "libunwind" -PACKAGECONFIG[gtk] = "-Denable_gtk=true,-Denable_gtk=false,gtk+3 libdazzle" -PACKAGECONFIG[sysprofd] = "-Dwith_sysprofd=bundled,-Dwith_sysprofd=none,polkit" -PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,polkit" +PACKAGECONFIG[gtk] = "-Dgtk=true,-Dgtk=false,gtk4 libadwaita" +PACKAGECONFIG[sysprofd] = "-Dsysprofd=bundled,-Dsysprofd=none,polkit" +PACKAGECONFIG[libsysprof] = "-Dlibsysprof=true,-Dlibsysprof=false,json-glib" PACKAGECONFIG[libunwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[agent] = "-Dagent=true,-Dagent=false," EXTRA_OEMESON += "-Dsystemdunitdir=${systemd_unitdir}/system" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb index 62b3aa3e3e..e430b167d7 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/tecla/tecla_46.0.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/tecla/tecla_47.0.bb @@ -13,4 +13,4 @@ REQUIRED_DISTRO_FEATURES = "wayland" inherit gnomebase pkgconfig features_check -SRC_URI[archive.sha256sum] = "4a081eab867a5a8b09758991cad7645920f323aabca954408290fb6f44591b0f" +SRC_URI[archive.sha256sum] = "0790b99ec29137a54b546c510661a99aa6f039c8d75f10c08e928682c0804fe5" diff --git a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb index 1b3ded0211..14986f2650 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/yelp/yelp_42.2.bb @@ -39,3 +39,5 @@ FILES:${PN} += " \ " RDEPENDS:${PN} += "yelp-xsl" + +CVE_STATUS[CVE-2008-3533] = "cpe-incorrect: The current version (42.2) is not affected. Fixed in 2.24." diff --git a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.2.bb index 88b4b5c86c..801eaae8e0 100644 --- a/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.1.bb +++ b/meta-openembedded/meta-gnome/recipes-gnome/zenity/zenity_4.0.2.bb @@ -18,7 +18,7 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" REQUIRED_DISTRO_FEATURES = "opengl" GTKIC_VERSION = "4" -SRC_URI[archive.sha256sum] = "0c2f537813b10f728470d9d05d6c95713db2512f9c95096e1e85b1a6739605e6" +SRC_URI[archive.sha256sum] = "c16dcae46e29e22c2fa0b95e80e06c96b2aec93840161369c95c85ed9f093153" PACKAGECONFIG ?= "webkitgtk" PACKAGECONFIG[webkitgtk] = "-Dwebkitgtk=true,-Dwebkitgtk=false,webkitgtk" diff --git a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb index 0e86d781ce..1c6d34e461 100644 --- a/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.0.bb +++ b/meta-openembedded/meta-gnome/recipes-support/colord-gtk/colord-gtk_0.3.1.bb @@ -10,7 +10,7 @@ DEPENDS = " \ " SRC_URI = "http://www.freedesktop.org/software/colord/releases/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "b9466656d66d9a6ffbc2dd04fa91c8f6af516bf9efaacb69744eec0f56f3c1d0" +SRC_URI[sha256sum] = "c176b889b75630a17f4e3d7ef24c09a3e12368e633496087459c8b53ac3a122d" PACKAGECONFIG ??= "gtk3 gtk4" PACKAGECONFIG[gtk3] = "-Dgtk3=true, -Dgtk3=false, gtk+3" diff --git a/meta-openembedded/meta-initramfs/README.md b/meta-openembedded/meta-initramfs/README.md index 119293a741..0005c4a488 100644 --- a/meta-openembedded/meta-initramfs/README.md +++ b/meta-openembedded/meta-initramfs/README.md @@ -12,19 +12,19 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: styhead Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-initramfs]' in the subject. +with '[meta-initramfs][styhead]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-initramfs][styhead][PATCH' -Interm layer maintainer: Khem Raj <raj.khem@gmail.com> +Interm layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-initramfs/classes/klibc.bbclass b/meta-openembedded/meta-initramfs/classes/klibc.bbclass index 202d132d94..ca50a3d431 100644 --- a/meta-openembedded/meta-initramfs/classes/klibc.bbclass +++ b/meta-openembedded/meta-initramfs/classes/klibc.bbclass @@ -9,7 +9,7 @@ CC:append:armv7ve = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE CC:append:armv7a = " ${@' -mfloat-abi=${TUNE_CCARGS_MFLOAT}' if (d.getVar('TUNE_CCARGS_MFLOAT') != '') else ''}" # klcc uses own optimizations by default. See klcc(1) man file. -export CFLAGS="${TUNE_CCARGS}" +export CFLAGS="${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}" export CPPFLAGS="${TUNE_CCARGS}" export LDFLAGS="${TUNE_CCARGS}" diff --git a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_102.bb b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_103.bb index 39ff265a31..3ee348dbfd 100644 --- a/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_102.bb +++ b/meta-openembedded/meta-initramfs/recipes-devtools/dracut/dracut_103.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" PE = "1" -SRCREV = "1a8ee6e00bbe017717a5ef9e9bcfefb3b88f629e" +SRCREV = "3fce598fb45aa5618cdf885eb48cf327104ffcb8" SRC_URI = "git://github.com/dracut-ng/dracut-ng.git;protocol=http;branch=main \ file://0001-feat-dracut-install-split-ldd-command-arguments-for-.patch \ " diff --git a/meta-openembedded/meta-multimedia/README.md b/meta-openembedded/meta-multimedia/README.md index 235c34331b..b7d1248ac7 100644 --- a/meta-openembedded/meta-multimedia/README.md +++ b/meta-openembedded/meta-multimedia/README.md @@ -1,17 +1,17 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: styhead URI: git://git.openembedded.org/meta-openembedded layers: meta-oe -branch: master +branch: styhead -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia]' in the subject +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-multimedia][styhead]' in the subject When sending single patches, please use something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-multimedia][styhead][PATCH' You are encouraged to fork the mirror on github https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. Other services like GitLab, repo.or.cz or self hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend github because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb index e79bd77a54..8a506af440 100644 --- a/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.42.5.bb +++ b/meta-openembedded/meta-multimedia/recipes-connectivity/rygel/rygel_0.44.0.bb @@ -20,7 +20,7 @@ inherit gnomebase features_check vala gobject-introspection gettext systemd # gobject-introspection is mandatory for libmediaart-2.0 and cannot be configured REQUIRED_DISTRO_FEATURES = "gobject-introspection-data x11" -SRC_URI[archive.sha256sum] = "1133602d2e6710aade6b22aa98d93384c8d56396f344763413e96e0110b7d89f" +SRC_URI[archive.sha256sum] = "5e1a76507209290530e6ce0141fc76946009edfb0fac3ed9432130821e5e4e72" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch new file mode 100644 index 0000000000..fbd145e6b5 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa/0001-Use-basename-implementation-from-glib-2.0.patch @@ -0,0 +1,88 @@ +From 070ed35ac5cef8138ed4760582bb72e8d3e136e2 Mon Sep 17 00:00:00 2001 +From: Arkadiusz Bokowy <arkadiusz.bokowy@gmail.com> +Date: Sun, 25 Aug 2024 08:42:39 +0200 +Subject: [PATCH] Fix compilation on strict POSIX platforms + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Submitted [https://github.com/arkq/bluez-alsa/commit/070ed35ac5cef8138ed4760582bb72e8d3e136e2] +--- + src/main.c | 2 +- + test/mock/mock.c | 2 +- + utils/aplay/aplay.c | 1 + + utils/cli/cli.c | 1 + + utils/rfcomm/rfcomm.c | 1 + + 5 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 96a66aee..eeb80165 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -13,13 +13,13 @@ + #endif + + #include <getopt.h> ++#include <libgen.h> + #include <sched.h> + #include <signal.h> + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <strings.h> + #include <syslog.h> + #include <time.h> +diff --git a/test/mock/mock.c b/test/mock/mock.c +index 947211a3..0a2f6091 100644 +--- a/test/mock/mock.c ++++ b/test/mock/mock.c +@@ -20,12 +20,12 @@ + #include <assert.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <signal.h> + #include <stdbool.h> + #include <stdint.h> + #include <stdio.h> + #include <stdlib.h> +-#include <string.h> + #include <strings.h> + #include <sys/stat.h> + #include <unistd.h> +diff --git a/utils/aplay/aplay.c b/utils/aplay/aplay.c +index 3de77902..36843e95 100644 +--- a/utils/aplay/aplay.c ++++ b/utils/aplay/aplay.c +@@ -15,6 +15,7 @@ + #include <assert.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <math.h> + #include <poll.h> + #include <pthread.h> +diff --git a/utils/cli/cli.c b/utils/cli/cli.c +index aeeabe58..0338b9e2 100644 +--- a/utils/cli/cli.c ++++ b/utils/cli/cli.c +@@ -13,6 +13,7 @@ + #endif + + #include <getopt.h> ++#include <libgen.h> + #include <stdarg.h> + #include <stdbool.h> + #include <stdint.h> +diff --git a/utils/rfcomm/rfcomm.c b/utils/rfcomm/rfcomm.c +index d01f0810..3dacfd67 100644 +--- a/utils/rfcomm/rfcomm.c ++++ b/utils/rfcomm/rfcomm.c +@@ -15,6 +15,7 @@ + #include <ctype.h> + #include <errno.h> + #include <getopt.h> ++#include <libgen.h> + #include <poll.h> + #include <stdbool.h> + #include <stdint.h> diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb index 5007c88fff..f089e036e3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_git.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/bluealsa/bluealsa_4.3.0.bb @@ -1,22 +1,31 @@ SUMMARY = "Bluetooth Audio ALSA Backend" +DESCRIPTION = "\ + BlueALSA is a replacement for BlueZ >= 5, with which one can achieve the \ + same Bluetooth audio profile support as with PulseAudio, but with fewer \ + dependencies and at a lower level in the software stack. It is designed \ + specifically for use on small, low-powered, dedicated audio or audio/visual \ + systems where the high-level audio management features of PulseAudio or \ + PipeWire are not required. \ +" HOMEPAGE = "https://github.com/Arkq/bluez-alsa" +BUGTRACKER = "https://github.com/arkq/bluez-alsa/issues" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8449a4f133a93f6254b496d4fb476e83" +LIC_FILES_CHKSUM = "file://LICENSE;md5=143bc4e73f39cc5e89d6e096ac0315ba" -SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master" +DEPENDS += "alsa-lib bluez5 dbus glib-2.0-native python3-packaging-native sbc" -SRCREV = "dd05a1baa261b94da9ba977b5e3392c8b4dc7a5e" -PV = "4.0.0+git" +SRC_URI = "git://github.com/Arkq/bluez-alsa.git;protocol=https;branch=master \ + file://0001-Use-basename-implementation-from-glib-2.0.patch" -S = "${WORKDIR}/git" +SRCREV = "959573c2cccef5cf074f5b2fa7941abbd699c5f4" -DEPENDS += "alsa-lib bluez5 dbus glib-2.0 sbc" +S = "${WORKDIR}/git" PACKAGECONFIG ??= "aplay cli hcitop ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" -PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" -PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" +PACKAGECONFIG[a2dpconf] = "--enable-a2dpconf,--disable-a2dpconf" +PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,fdk-aac" PACKAGECONFIG[aplay] = "--enable-aplay,--disable-aplay" PACKAGECONFIG[cli] = "--enable-cli,--disable-cli" PACKAGECONFIG[coverage] = "--with-coverage,--without-coverage,lcov-native" @@ -25,8 +34,10 @@ PACKAGECONFIG[debug-time] = "--enable-debug-time,--disable-debug-time" PACKAGECONFIG[faststream] = "--enable-faststream,--disable-faststream" PACKAGECONFIG[hcitop] = "--enable-hcitop,--disable-hcitop,libbsd ncurses" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[midi] = "--enable-midi,--disable-midi" PACKAGECONFIG[mp3lame] = "--enable-mp3lame,--disable-mp3lame,lame" PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123,mpg123" +PACKAGECONFIG[msbc] = "--enable-msbc,--disable-msbc,spandsp" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono,ofono" PACKAGECONFIG[payloadcheck] = "--enable-payloadcheck,--disable-payloadcheck" PACKAGECONFIG[rfcomm] = "--enable-rfcomm,--disable-rfcomm" @@ -35,9 +46,10 @@ PACKAGECONFIG[systemd] = "--enable-systemd --with-systemdsystemunitdir=${systemd PACKAGECONFIG[test] = "--enable-test,--disable-test,libcheck libsndfile1" PACKAGECONFIG[upower] = "--enable-upower,--disable-upower,,upower" -inherit autotools pkgconfig systemd +inherit autotools pkgconfig python3native systemd -EXTRA_OECONF = " \ +# These proprietary codecs are not available in Yocto +EXTRA_OECONF = "\ --disable-aptx \ --disable-lc3plus \ --disable-ldac \ @@ -45,10 +57,11 @@ EXTRA_OECONF = " \ " PACKAGE_BEFORE_PN = "${PN}-aplay" -RRECOMMENDS:${PN} = "${PN}-aplay" -FILES:${PN}-aplay = "${bindir}/bluealsa-aplay" -FILES:${PN} += "${libdir}/alsa-lib/*" +FILES:${PN}-aplay += "${bindir}/bluealsa-aplay" +FILES:${PN} += "${libdir}/alsa-lib/* ${datadir}/dbus-1/system.d" + +RRECOMMENDS:${PN} = "${PN}-aplay" SYSTEMD_PACKAGES += "${PN}-aplay" SYSTEMD_SERVICE:${PN} = "bluealsa.service" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb index 4e8412303b..6b7f3090a3 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/dav1d/dav1d_1.4.3.bb @@ -6,8 +6,8 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669" -SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;branch=master" -SRCREV = "805d9e5a8ffce3ef78cebde4bfedf3642907b2d3" +SRC_URI = "git://code.videolan.org/videolan/dav1d.git;protocol=https;nobranch=1" +SRCREV = "e9986de7f4264940af6fa1df1498fd2754077de4" S = "${WORKDIR}/git" @@ -15,3 +15,6 @@ DEPENDS:append:x86 = " nasm-native" DEPENDS:append:x86-64 = " nasm-native" inherit meson pkgconfig + +# RVV assembler routines are not yet available for RISCV32 +EXTRA_OEMESON:append:riscv32 = " -Denable_asm=false" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch new file mode 100644 index 0000000000..899ef26637 --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite/0001-Remove-defining-const-as-nothing.patch @@ -0,0 +1,79 @@ +From c71d844f5639ea447b9f795a4db5b5d43f0de814 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Jul 2024 21:41:24 -0700 +Subject: [PATCH] Remove defining 'const' as nothing + +This is a hack to override constness of struct members +however, with modern compiler like clang with fortified +glibc ( 2.40+ ) headers this runs into compiler errors + +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:38:54: error: pass_object_size attribute only applies to constant pointer arguments +| 38 | __fortify_clang_overload_arg (char *, __restrict, __resolved))) +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:73:43: error: pass_object_size attribute only applies to constant pointer arguments +| 73 | __fortify_clang_overload_arg (char *, ,__buf), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:91:55: error: pass_object_size attribute only applies to constant pointer arguments +| 91 | __NTH (wctomb (__fortify_clang_overload_arg (char *, ,__s), wchar_t __wchar)) +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:129:71: error: pass_object_size attribute only applies to constant pointer arguments +| 129 | __NTH (mbstowcs (__fortify_clang_overload_arg (wchar_t *, __restrict, __dst), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/flite/2.2/recipe-sysroot/usr/include/bits/stdlib.h:159:68: error: pass_object_size attribute only applies to constant pointer arguments +| 159 | __NTH (wcstombs (__fortify_clang_overload_arg (char *, __restrict, __dst), +| | ^ +| 5 errors generated. +| + +Therefore take this out, instead cast away the 'const' qualifier where needed ( equilly dangerous ) +however limited to just this file instead of apply to all headers including system headers + +Upstream-Status: Submitted [https://github.com/festvox/flite/pull/112] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tools/find_sts_main.c | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) + +diff --git a/tools/find_sts_main.c b/tools/find_sts_main.c +index 3c94449..a5bf8ef 100644 +--- a/tools/find_sts_main.c ++++ b/tools/find_sts_main.c +@@ -41,9 +41,6 @@ + #include <math.h> + #include <string.h> + +-/* To allow some normally const fields to manipulated during building */ +-#define const +- + #include "cst_args.h" + #include "cst_wave.h" + #include "cst_track.h" +@@ -132,16 +129,16 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) + lpc->frames[i],lpc->num_channels, + resd, + size); +- sts[i].size = size; ++ *(int *)(&sts[i].size) = size; + sts[i].frame = cst_alloc(unsigned short,lpc->num_channels-1); + for (j=1; j < lpc->num_channels; j++) +- sts[i].frame[j-1] = (unsigned short) ++ *(unsigned short *)(&sts[i].frame[j-1]) = (unsigned short) + (((lpc->frames[i][j]-lpc_min)/lpc_range)*65535); + if (cst_streq(residual_codec,"ulaw")) + { + sts[i].residual = cst_alloc(unsigned char,size); + for (j=0; j < size; j++) +- sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); ++ *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); + } + else if (cst_streq(residual_codec,"g721")) + { +@@ -189,7 +186,7 @@ cst_sts *find_sts(cst_wave *sig, cst_track *lpc) + { + sts[i].residual = cst_alloc(unsigned char,size); + for (j=0; j < size; j++) +- sts[i].residual[j] = cst_short_to_ulaw((short)resd[j]); ++ *(unsigned char *)(&sts[i].residual[j]) = cst_short_to_ulaw((short)resd[j]); + } + else /* Unvoiced frame */ + { diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb index 0a7680a8c4..bb9edfd5bf 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/flite/flite_2.2.bb @@ -9,6 +9,7 @@ inherit autotools-brokensep DEPENDS += "alsa-lib chrpath-replacement-native" SRC_URI = "git://github.com/festvox/flite.git;protocol=https;branch=master" +SRC_URI += "file://0001-Remove-defining-const-as-nothing.patch" SRCREV = "e9e2e37c329dbe98bfeb27a1828ef9a71fa84f88" @@ -25,3 +26,5 @@ do_install:append() { } # | make[1]: *** No rule to make target 'flite_voice_list.c', needed by 'all'. Stop. PARALLEL_MAKE = "" + +CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb index fea14fd840..da2953ef21 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.0.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/gerbera/gerbera_2.2.0.bb @@ -4,7 +4,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=25cdec9afe3f1f26212ead6bd2f7fac8" SRC_URI = "git://github.com/gerbera/gerbera.git;protocol=https;branch=master" -SRCREV = "2f26e656b16fb86132f27d1f8d47c6055041430d" +SRCREV = "821d364d611dc30b3ef8a5e9beb0bf3e71b25199" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch index c336e92548..0ca2082c03 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera/0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch @@ -1,4 +1,4 @@ -From 11cc6dbd45f0880beea64cdc514f57484b90bc39 Mon Sep 17 00:00:00 2001 +From a3e25b6aa9775c43336e30d3b350f54c085a32c8 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Tue, 20 Feb 2024 18:44:23 -0800 Subject: [PATCH] rpi: Use malloc instead of variable length arrays @@ -8,16 +8,14 @@ Clang-18+ diagnoses this as error | ../git/src/ipa/rpi/controller/rpi/alsc.cpp:499:10: error: variable length arrays in C++ are a Clang extension [-Werror,-Wvla-cxx-extension] | 499 | int xLo[X], xHi[X]; | | ^ -Upstream-Status: Submitted [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040529.html] +Upstream-Status: Denied [https://lists.libcamera.org/pipermail/libcamera-devel/2024-February/040536.html] Signed-off-by: Khem Raj <raj.khem@gmail.com> - -s --- src/ipa/rpi/controller/rpi/alsc.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/ipa/rpi/controller/rpi/alsc.cpp b/src/ipa/rpi/controller/rpi/alsc.cpp -index 8a205c60..a7d42614 100644 +index 67029fc3..6eca9fb7 100644 --- a/src/ipa/rpi/controller/rpi/alsc.cpp +++ b/src/ipa/rpi/controller/rpi/alsc.cpp @@ -496,8 +496,8 @@ void resampleCalTable(const Array2D<double> &calTableIn, @@ -26,8 +24,8 @@ index 8a205c60..a7d42614 100644 */ - int xLo[X], xHi[X]; - double xf[X]; -+ int *xLo = (int*)malloc(X), *xHi = (int*)malloc(X); -+ double *xf = (double*)malloc(X); ++ int *xLo = (int *)malloc(X * sizeof(int)), *xHi = (int *)malloc(X * sizeof(int)); ++ double *xf = (double *)malloc(X * sizeof(double)); double scaleX = cameraMode.sensorWidth / (cameraMode.width * cameraMode.scaleX); double xOff = cameraMode.cropX / (double)cameraMode.sensorWidth; diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb index 93f29c1612..857f565fb7 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/libcamera/libcamera_0.3.0.bb @@ -12,7 +12,7 @@ SRC_URI = " \ git://git.libcamera.org/libcamera/libcamera.git;protocol=https;branch=master \ file://0001-media_device-Add-bool-return-type-to-unlock.patch \ file://0002-options-Replace-use-of-VLAs-in-C.patch \ - file://0001-rpi-Use-alloca-instead-of-variable-length-arrays.patch \ + file://0001-rpi-Use-malloc-instead-of-variable-length-arrays.patch \ " SRCREV = "aee16c06913422a0ac84ee3217f87a9795e3c2d9" @@ -24,10 +24,11 @@ S = "${WORKDIR}/git" DEPENDS = "python3-pyyaml-native python3-jinja2-native python3-ply-native python3-jinja2-native udev gnutls chrpath-native libevent libyaml" DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'qt', 'qtbase qtbase-native', '', d)}" -PACKAGES =+ "${PN}-gst" +PACKAGES =+ "${PN}-gst ${PN}-pycamera" PACKAGECONFIG ??= "" PACKAGECONFIG[gst] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" +PACKAGECONFIG[pycamera] = "-Dpycamera=enabled,-Dpycamera=disabled,python3 python3-pybind11" LIBCAMERA_PIPELINES ??= "auto" @@ -71,6 +72,7 @@ do_package_recalculate_ipa_signatures() { FILES:${PN} += " ${libexecdir}/libcamera/v4l2-compat.so" FILES:${PN}-gst = "${libdir}/gstreamer-1.0" +FILES:${PN}-pycamera = "${PYTHON_SITEPACKAGES_DIR}/libcamera" # libcamera-v4l2 explicitly sets _FILE_OFFSET_BITS=32 to get access to # both 32 and 64 bit file APIs. diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc index aabf81dce0..170e676b24 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna.inc @@ -11,9 +11,8 @@ inherit gettext autotools-brokensep update-rc.d systemd SRC_URI = "git://git.code.sf.net/p/minidlna/git;branch=master;module=git \ file://minidlna-daemon.init.d \ file://minidlna.service \ - file://0001-Update-Gettext-version.patch \ file://0001-configure-Check-for-clock_gettime-seprately-from-__N.patch \ - file://0001-configure.ac-drop-non-standard-checks.patch \ + file://0001-Add-compatibility-with-FFMPEG-7.0.patch \ " S = "${WORKDIR}/git" @@ -22,6 +21,10 @@ S = "${WORKDIR}/git" # configure.ac:30: error: required file './ABOUT-NLS' not found EXTRA_AUTORECONF = "" +# Reproducibility: force os-name and os-version to constants to avoid host +# related build differences +EXTRA_OECONF = "--with-os-name='${DISTRO_NAME}' --with-os-version=''" + do_install:append(){ install -d ${D}${sysconfdir} install -m 0755 minidlna.conf ${D}${sysconfdir} diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch new file mode 100644 index 0000000000..f9d9c694bc --- /dev/null +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Add-compatibility-with-FFMPEG-7.0.patch @@ -0,0 +1,49 @@ +From 92f8b94c697c225fb31062586f817c4fc3df8c2a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2024 13:22:33 -0700 +Subject: [PATCH] Add compatibility with FFMPEG 7.0 + +channel_layout has been replaced with ch_layout + +Upstream-Status: Submitted [https://sourceforge.net/p/minidlna/git/merge-requests/59/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libav.h | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/libav.h b/libav.h +index b69752c..a3153bd 100644 +--- a/libav.h ++++ b/libav.h +@@ -58,6 +58,7 @@ + #endif + + #define USE_CODECPAR LIBAVFORMAT_VERSION_INT >= ((57<<16)+(50<<8)+100) ++#define USE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) + + #ifndef FF_PROFILE_H264_BASELINE + #define FF_PROFILE_H264_BASELINE 66 +@@ -174,7 +175,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codecpar->codec_tag + #define lav_sample_rate(s) s->codecpar->sample_rate + #define lav_bit_rate(s) s->codecpar->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codecpar->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codecpar->channels ++#endif + #define lav_width(s) s->codecpar->width + #define lav_height(s) s->codecpar->height + #define lav_profile(s) s->codecpar->profile +@@ -186,7 +191,11 @@ lav_get_interlaced(AVStream *s) + #define lav_codec_tag(s) s->codec->codec_tag + #define lav_sample_rate(s) s->codec->sample_rate + #define lav_bit_rate(s) s->codec->bit_rate ++#if USE_CH_LAYOUT ++#define lav_channels(s) s->codec->ch_layout.nb_channels ++#else + #define lav_channels(s) s->codec->channels ++#endif + #define lav_width(s) s->codec->width + #define lav_height(s) s->codec->height + #define lav_profile(s) s->codec->profile diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch deleted file mode 100644 index 6100da3581..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-Update-Gettext-version.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a4290bf1887f9203288858ca76bdd20b2edf337a Mon Sep 17 00:00:00 2001 -From: Baptiste Durand <baptiste.durand@gmail.com> -Date: Sun, 9 Sep 2018 20:50:41 +0200 -Subject: [PATCH] Update Gettext version - -Upstream-Status: Inappropriate [oe-core specific] - -Signed-off-by: Baptiste Durand <baptiste.durand@gmail.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,7 @@ - # License along with MiniDLNA; if not, write to the Free Software - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - # USA. --AC_INIT(MiniDLNA,1.1.3,,minidlna) -+AC_INIT(MiniDLNA,1.2.1,,minidlna) - #LT_INIT - - AC_CANONICAL_TARGET -@@ -28,7 +28,7 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS], [AC - - AM_ICONV - AM_GNU_GETTEXT([external]) --AM_GNU_GETTEXT_VERSION(0.18) -+AM_GNU_GETTEXT_VERSION(0.20) - - # Checks for programs. - AC_PROG_AWK diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch deleted file mode 100644 index 93334b7dab..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna/0001-configure.ac-drop-non-standard-checks.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 83425344b2d7339e8f5b0ad230c51278d330d613 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Sat, 22 Jan 2022 11:41:50 +0100 -Subject: [PATCH] configure.ac: drop non-standard checks - -Not sure what upstream is trying to do here but it does not work -with the latest autoconf. - -Upstream-Status: Inactive-Upstream -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - configure.ac | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index aa7dd1c..858db52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -418,7 +418,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - AC_CHECK_LIB([id3tag -lz], [id3_file_open], [LIBID3TAG_LIBS="-lid3tag -lz"], [unset ac_cv_lib_id3tag_id3_file_open; LDFLAGS="$LDFLAGS_SAVE"; continue]) - break - done --test x"$ac_cv_lib_id3tag__lz___id3_file_open" = x"yes" || AC_MSG_ERROR([Could not find libid3tag]) - AC_SUBST(LIBID3TAG_LIBS) - - LDFLAGS_SAVE="$LDFLAGS" -@@ -444,10 +443,6 @@ for dir in "" /usr/local $SEARCH_DIR; do - [unset ac_cv_lib_avformat_av_open_input_file; unset ac_cv_lib_avformat_avformat_open_input; LDFLAGS="$LDFLAGS_SAVE"; continue])]) - break - done --if test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___av_open_input_file" != x"yes" && -- test x"$ac_cv_lib_avformat__lavcodec__lavutil__lz___avformat_open_input" != x"yes"; then -- AC_MSG_ERROR([Could not find libavformat - part of ffmpeg]) --fi - AC_SUBST(LIBAVFORMAT_LIBS) - - AC_CHECK_LIB(pthread, pthread_create) diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb index 4238918c97..da0d90a993 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/minidlna/minidlna_1.3.3.bb @@ -1,4 +1,4 @@ require ${BPN}.inc -SRCREV = "109d63cb11ac207c18a784556834eb054b34b00b" +SRCREV = "1a9b32ee7a1c89e54e9f148199b73f9b33ad45ba" LIC_FILES_CHKSUM = "file://LICENCE.miniupnpd;md5=b0dabf9d8e0f871554e309d62ead8d2b" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb index 2746c6bb80..2746c6bb80 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.20.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/libmpdclient_2.22.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb index 93df25ee2f..93df25ee2f 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.34.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpc_0.35.bb diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch deleted file mode 100644 index b2dea331ef..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd/0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e62fd0eefe8b475e70d87a673a7216aac3bb622f Mon Sep 17 00:00:00 2001 -From: Markus Volk <f_l_k@t-online.de> -Date: Mon, 20 Nov 2023 17:49:59 +0100 -Subject: [PATCH] patch src_decoder_plugins_FfmpegIo.cxx - -Signed-off-by: Markus Volk <f_l_k@t-online.de> -Upstream-Status: Pending [https://github.com/MusicPlayerDaemon/MPD/issues/1898] ---- - src/decoder/plugins/FfmpegIo.cxx | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/decoder/plugins/FfmpegIo.cxx b/src/decoder/plugins/FfmpegIo.cxx -index 572f1a86a..3e2347fec 100644 ---- a/src/decoder/plugins/FfmpegIo.cxx -+++ b/src/decoder/plugins/FfmpegIo.cxx -@@ -25,6 +25,7 @@ - #include "input/InputStream.hxx" - - extern "C" { -+#include <libavutil/error.h> - #include <libavutil/mem.h> - } - --- -2.42.0 - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb index 33155da7d2..f066c405f1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.14.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/musicpd/mpd_0.23.15.bb @@ -18,14 +18,19 @@ DEPENDS += " \ fmt \ " +PV .= "+git" SRC_URI = "git://github.com/MusicPlayerDaemon/MPD;branch=master;protocol=https \ - file://0001-patch-src_decoder_plugins_FfmpegIo.cxx.patch \ file://mpd.conf.in \ " -SRCREV = "feac1a3f56591ccfb00870aba66c9ac3abac4773" +SRCREV = "965c466e9bda262790e76edd5272e9e74b407ff3" S = "${WORKDIR}/git" -EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" +EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)} \ + -Dadplug=disabled \ + -Dsndio=disabled \ + -Dshine=disabled \ + -Dtremor=disabled \ +" PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "aac", "", d)} \ alsa ao bzip2 daemon \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb index 672c8abc9a..618eaa68d1 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb @@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ openal-soft \ opusfile \ opus-tools \ - ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ tinyalsa \ ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb index 0c68cc4d28..0a2088a3cd 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.0.7.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/pipewire/pipewire_1.2.3.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "dbus ncurses" -SRCREV = "59fe89d41a67f6daad086f8f3fe522935be77a3f" -SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.0;protocol=https" +SRCREV = "e2a76824e2b112b15ae4a1a3d444696d5526f8d8" +SRC_URI = "git://gitlab.freedesktop.org/pipewire/pipewire.git;branch=1.2;protocol=https" S = "${WORKDIR}/git" @@ -72,6 +72,9 @@ EXTRA_OEMESON += " \ # mode but it looks like clang still does CFLAGS:append = " -Wno-typedef-redefinition" +# Specify linking with -latomic on architectures missing 64bit atomics. +LDFLAGS += "${@bb.utils.contains_any('TUNE_FEATURES', 'riscv32 armv5 mips ppc32 m32', '-latomic', '', d)}" + # According to wireplumber documentation only one session manager should be installed at a time # Possible options are media-session, which has fewer dependencies but is very simple, # or wireplumber, which is more powerful. @@ -292,6 +295,7 @@ FILES:${PN}-tools = " \ ${bindir}/pw-cat \ ${bindir}/pw-cli \ ${bindir}/pw-config \ + ${bindir}/pw-container \ ${bindir}/pw-dot \ ${bindir}/pw-dsdplay \ ${bindir}/pw-dump \ diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch deleted file mode 100644 index 3f2aa60512..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4645.patch +++ /dev/null @@ -1,179 +0,0 @@ -From 1e2918115ca2f5c4ffde00dc02ad89525714f6c2 Mon Sep 17 00:00:00 2001 -From: Thomas Guillem <thomas@gllm.fr> -Date: Tue, 5 Dec 2023 09:23:35 +0100 -Subject: [PATCH 1/5] input: fix incompatible-pointer-types assignment - -Fixes #28441 -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4645] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/input/input_internal.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/input/input_internal.h b/src/input/input_internal.h -index d29731edca1b..ea02f39f5add 100644 ---- a/src/input/input_internal.h -+++ b/src/input/input_internal.h -@@ -117,7 +117,7 @@ typedef struct input_thread_private_t - - /* Title infos FIXME multi-input (not easy) ? */ - int i_title; -- const input_title_t **title; -+ input_title_t * const *title; - - int i_title_offset; - int i_seekpoint_offset; --- -GitLab - - -From adcf4e66e2ce2c382bb97957c91bfde040f4f3ca Mon Sep 17 00:00:00 2001 -From: Zhao Zhili <quinkblack@foxmail.com> -Date: Thu, 1 Mar 2018 14:25:59 +0800 -Subject: [PATCH 2/5] yadif: fix variable type - -Signed-off-by: Thomas Guillem <thomas@gllm.fr> -(cherry picked from commit 77b86f4452be4dbe0d56a9cd1b66da61b116da60) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/video_filter/deinterlace/yadif.h | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/modules/video_filter/deinterlace/yadif.h b/modules/video_filter/deinterlace/yadif.h -index 4bc592ba9307..af16443d0804 100644 ---- a/modules/video_filter/deinterlace/yadif.h -+++ b/modules/video_filter/deinterlace/yadif.h -@@ -140,10 +140,10 @@ static void yadif_filter_line_c(uint8_t *dst, uint8_t *prev, uint8_t *cur, uint8 - } - - static void yadif_filter_line_c_16bit(uint8_t *dst8, uint8_t *prev8, uint8_t *cur8, uint8_t *next8, int w, int prefs, int mrefs, int parity, int mode) { -- uint8_t *dst = (uint8_t *)dst8; -- uint8_t *prev = (uint8_t *)prev8; -- uint8_t *cur = (uint8_t *)cur8; -- uint8_t *next = (uint8_t *)next8; -+ uint16_t *dst = (uint16_t *)dst8; -+ uint16_t *prev = (uint16_t *)prev8; -+ uint16_t *cur = (uint16_t *)cur8; -+ uint16_t *next = (uint16_t *)next8; - int x; - uint16_t *prev2= parity ? prev : cur ; - uint16_t *next2= parity ? cur : next; --- -GitLab - - -From 45198e5328ff2b2f4eb2fb76add0789fec26270f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 3 Mar 2019 09:59:10 +0200 -Subject: [PATCH 3/5] swscale: avoid invalid pointer conversion - -(cherry picked from commit ab00e6c59d42e05ab08893091783d8b5febc0058) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/video_chroma/swscale.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - -diff --git a/modules/video_chroma/swscale.c b/modules/video_chroma/swscale.c -index 8993d11ec5dd..11897527355c 100644 ---- a/modules/video_chroma/swscale.c -+++ b/modules/video_chroma/swscale.c -@@ -588,8 +588,9 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - { - filter_sys_t *p_sys = p_filter->p_sys; - uint8_t palette[AVPALETTE_SIZE]; -- uint8_t *src[4]; int src_stride[4]; -- uint8_t *dst[4]; int dst_stride[4]; -+ uint8_t *src[4], *dst[4]; -+ const uint8_t *csrc[4]; -+ int src_stride[4], dst_stride[4]; - - GetPixels( src, src_stride, p_sys->desc_in, &p_filter->fmt_in.video, - p_src, i_plane_count, b_swap_uvi ); -@@ -606,11 +607,14 @@ static void Convert( filter_t *p_filter, struct SwsContext *ctx, - GetPixels( dst, dst_stride, p_sys->desc_out, &p_filter->fmt_out.video, - p_dst, i_plane_count, b_swap_uvo ); - -+ for (size_t i = 0; i < ARRAY_SIZE(src); i++) -+ csrc[i] = src[i]; -+ - #if LIBSWSCALE_VERSION_INT >= ((0<<16)+(5<<8)+0) -- sws_scale( ctx, src, src_stride, 0, i_height, -+ sws_scale( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #else -- sws_scale_ordered( ctx, src, src_stride, 0, i_height, -+ sws_scale_ordered( ctx, csrc, src_stride, 0, i_height, - dst, dst_stride ); - #endif - } --- -GitLab - - -From 4431076ad4a21fdcabd3f7ef1d61c45891689b0c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 3 Mar 2019 17:20:04 +0200 -Subject: [PATCH 4/5] dynamicoverlay: fix variable shadowing - -(cherry picked from commit d42e05d6b2c061ae352c131d5aebf8c8d8aa6d35) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a93462925e8a..a85f9aafb0b9 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -899,12 +899,11 @@ static const commanddesc_static_t p_commands[] = - void RegisterCommand( filter_t *p_filter ) - { - filter_sys_t *p_sys = (filter_sys_t*) p_filter->p_sys; -- size_t i_index = 0; - - p_sys->i_commands = ARRAY_SIZE(p_commands); - p_sys->pp_commands = (commanddesc_t **) calloc( p_sys->i_commands, sizeof(commanddesc_t*) ); - if( !p_sys->pp_commands ) return; -- for( i_index = 0; i_index < p_sys->i_commands; i_index ++ ) -+ for( size_t i_index = 0; i_index < p_sys->i_commands; i_index ++ ) - { - p_sys->pp_commands[i_index] = (commanddesc_t *) malloc( sizeof(commanddesc_t) ); - if( !p_sys->pp_commands[i_index] ) return; --- -GitLab - - -From fda14fc7c013eb75291df10cc8b88336c51328ad Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Mon, 26 Feb 2018 20:43:03 +0200 -Subject: [PATCH 5/5] dynamicoverlay: fix memory corruption - -Font alpha is 8-bits, not 32-bits. - -(cherry picked from commit 6f14081af7325d334a53126c4eea52bc30fc08a0) -Signed-off-by: Thomas Guillem <thomas@gllm.fr> ---- - modules/spu/dynamicoverlay/dynamicoverlay_commands.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -index a85f9aafb0b9..7a71c6f2373a 100644 ---- a/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -+++ b/modules/spu/dynamicoverlay/dynamicoverlay_commands.c -@@ -234,8 +234,12 @@ static int parser_SetTextAlpha( char *psz_command, char *psz_end, - skip_space( &psz_command ); - if( isdigit( (unsigned char)*psz_command ) ) - { -- if( parse_digit( &psz_command, &p_params->fontstyle.i_font_alpha ) == VLC_EGENERIC ) -+ int32_t value; -+ -+ if( parse_digit( &psz_command, &value ) == VLC_EGENERIC ) - return VLC_EGENERIC; -+ -+ p_params->fontstyle.i_font_alpha = value; - } - return VLC_SUCCESS; - } --- -GitLab - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch deleted file mode 100644 index c9ef33358e..0000000000 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc/4665.patch +++ /dev/null @@ -1,377 +0,0 @@ -From 770789f265761fc7ab2de69ca105fec4ad93d9e2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Mon, 26 Feb 2018 20:36:29 +0200 -Subject: [PATCH 1/9] chromaprint: missing cast - -(cherry picked from commit 7bd5bab3e43ae187f7219db61ed85d06d2ba0547) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> -Upstream-Status: Backport [https://code.videolan.org/videolan/vlc/-/merge_requests/4665] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - modules/stream_out/chromaprint.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c -index 80ec31ba2590..c76cbda3c2bb 100644 ---- a/modules/stream_out/chromaprint.c -+++ b/modules/stream_out/chromaprint.c -@@ -231,7 +231,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id, - if ( !p_sys->b_finished && id->i_samples > 0 && p_buf->i_buffer ) - { - if(! chromaprint_feed( p_sys->p_chromaprint_ctx, -- p_buf->p_buffer, -+ (int16_t *)p_buf->p_buffer, - p_buf->i_buffer / BYTESPERSAMPLE ) ) - msg_Warn( p_stream, "feed error" ); - id->i_samples -= i_samples; --- -GitLab - - -From 6179d6b843f2a93af6a3d51c4244766e3eba9e77 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 14 Apr 2019 09:41:38 +0300 -Subject: [PATCH 2/9] win32: wrap {g,s}etsockopt() - -char * can alias anything, and Winsock relies on that. Unfortunately, -the compiler still issues warnings. This works around that. - -(cherry picked from commit 36715d9b79f34824e126c2bc3aee2f1c1c16af46) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_network.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/include/vlc_network.h b/include/vlc_network.h -index 010454a01c09..e39ffd0bacaa 100644 ---- a/include/vlc_network.h -+++ b/include/vlc_network.h -@@ -183,6 +183,22 @@ VLC_API int vlc_close(int); - - /** @} */ - -+#ifdef _WIN32 -+static inline int vlc_getsockopt(int s, int level, int name, -+ void *val, socklen_t *len) -+{ -+ return getsockopt(s, level, name, (char *)val, len); -+} -+#define getsockopt vlc_getsockopt -+ -+static inline int vlc_setsockopt(int s, int level, int name, -+ const void *val, socklen_t len) -+{ -+ return setsockopt(s, level, name, (const char *)val, len); -+} -+#define setsockopt vlc_setsockopt -+#endif -+ - /* Portable network names/addresses resolution layer */ - - #define NI_MAXNUMERICHOST 64 --- -GitLab - - -From 3391108f9709f0d77d9297c94371cf9cd30f2cbe Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Thu, 7 Dec 2023 15:43:04 +0100 -Subject: [PATCH 3/9] netsync: use char for temporary local buffer - -On Windows recvfrom/revc/sendto expects a char*. ---- - modules/control/netsync.c | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/modules/control/netsync.c b/modules/control/netsync.c -index 2a6a1a6a2bf8..8c91034d7cf2 100644 ---- a/modules/control/netsync.c -+++ b/modules/control/netsync.c -@@ -181,7 +181,7 @@ static void *Master(void *handle) - intf_sys_t *sys = intf->p_sys; - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - if (poll(&ufd, 1, -1) < 0) - continue; -@@ -198,8 +198,8 @@ static void *Master(void *handle) - if (master_system < 0) - continue; - -- data[0] = hton64(mdate()); -- data[1] = hton64(master_system); -+ SetQWBE(&data[0], mdate()); -+ SetQWBE(&data[8], master_system); - - /* Reply to the sender */ - sendto(sys->fd, data, 16, 0, -@@ -224,7 +224,7 @@ static void *Slave(void *handle) - - for (;;) { - struct pollfd ufd = { .fd = sys->fd, .events = POLLIN, }; -- uint64_t data[2]; -+ char data[16]; - - vlc_tick_t system = GetPcrSystem(sys->input); - if (system < 0) -@@ -233,7 +233,7 @@ static void *Slave(void *handle) - /* Send clock request to the master */ - const vlc_tick_t send_date = mdate(); - -- data[0] = hton64(system); -+ SetQWBE(&data[0], system); - send(sys->fd, data, 8, 0); - - /* Don't block */ -@@ -244,8 +244,8 @@ static void *Slave(void *handle) - if (recv(sys->fd, data, 16, 0) < 16) - goto wait; - -- const vlc_tick_t master_date = ntoh64(data[0]); -- const vlc_tick_t master_system = ntoh64(data[1]); -+ const vlc_tick_t master_date = GetQWBE(&data[0]); -+ const vlc_tick_t master_system = GetQWBE(&data[8]); - const vlc_tick_t diff_date = receive_date - - ((receive_date - send_date) / 2 + master_date); - --- -GitLab - - -From 27e584d7b9add8dbbb82b7227228e1ec1e25a089 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Tue, 3 Jan 2023 13:23:00 +0100 -Subject: [PATCH 4/9] access/dtv: move the lfind() Windows hack in the module - -So that we don't have to include search.h each time vlc_fixups.h is used. - -The Win32 prototype of lfind() expects an unsigned* for 'nelp', not a size_t*. - -(cherry picked from commit 7c43bcba27b6fe256456d93a9d32e10648f08da8) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_fixups.h | 3 +++ - modules/access/dtv/access.c | 5 +++++ - 2 files changed, 8 insertions(+) - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 37f788933779..861cb4cc5063 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -501,8 +501,11 @@ void *tsearch( const void *key, void **rootp, int(*cmp)(const void *, const void - void *tfind( const void *key, const void **rootp, int(*cmp)(const void *, const void *) ); - void *tdelete( const void *key, void **rootp, int(*cmp)(const void *, const void *) ); - void twalk( const void *root, void(*action)(const void *nodep, VISIT which, int depth) ); -+#ifndef _WIN32 -+/* the Win32 prototype of lfind() expects an unsigned* for 'nmemb' */ - void *lfind( const void *key, const void *base, size_t *nmemb, - size_t size, int(*cmp)(const void *, const void *) ); -+#endif - #endif /* HAVE_SEARCH_H */ - #ifndef HAVE_TDESTROY - void tdestroy( void *root, void (*free_node)(void *nodep) ); -diff --git a/modules/access/dtv/access.c b/modules/access/dtv/access.c -index d9756c7b4885..c6ca5005883c 100644 ---- a/modules/access/dtv/access.c -+++ b/modules/access/dtv/access.c -@@ -32,6 +32,11 @@ - #ifdef HAVE_SEARCH_H - #include <search.h> - #endif -+#if defined(_WIN32) -+/* the Win32 prototype of lfind() expects an unsigned* for 'nelp' */ -+# define lfind(a,b,c,d,e) \ -+ lfind((a),(b), &(unsigned){ (*(c) > UINT_MAX) ? UINT_MAX : *(c) }, (d),(e)) -+#endif - - #include "dtv/dtv.h" - --- -GitLab - - -From 5a9ca37a95b6e85e6beaaefba9aa4a886a45411c Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Mon, 15 Jul 2019 12:41:29 +0200 -Subject: [PATCH 5/9] vlc_common: fix swab() calls on win32 that don't use - const on source pointer - -(cherry picked from commit a9e0b1124e19225b903a2926951781e84002c410) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - include/vlc_common.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/vlc_common.h b/include/vlc_common.h -index 8090b277150d..089878581763 100644 ---- a/include/vlc_common.h -+++ b/include/vlc_common.h -@@ -947,6 +947,11 @@ static inline void SetQWLE (void *p, uint64_t qw) - # define O_NONBLOCK 0 - # endif - -+/* the mingw32 swab() and win32 _swab() prototypes expect a char* instead of a -+ const void* */ -+# define swab(a,b,c) swab((char*) (a), (char*) (b), (c)) -+ -+ - # include <tchar.h> - #endif /* _WIN32 */ - --- -GitLab - - -From b758e19479a80604e3feb470b197e4a13a203a85 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 10 Jul 2019 08:23:45 +0200 -Subject: [PATCH 6/9] avcodec: encoder: fix MPEG4 matrix passed as const - -lavc expects a pointer that it will free in avcodec_free_context(). - -(cherry picked from commit d86c4c87aa78130a4fd00294e25df865d0e2b327) -Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz> ---- - modules/codec/avcodec/encoder.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/modules/codec/avcodec/encoder.c b/modules/codec/avcodec/encoder.c -index 2b1c3604713d..4919ccf0e0e4 100644 ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -588,8 +588,14 @@ int InitVideoEnc( vlc_object_t *p_this ) - - if ( p_sys->b_mpeg4_matrix ) - { -- p_context->intra_matrix = mpeg4_default_intra_matrix; -- p_context->inter_matrix = mpeg4_default_non_intra_matrix; -+ p_context->intra_matrix = av_malloc( sizeof(mpeg4_default_intra_matrix) ); -+ if ( p_context->intra_matrix ) -+ memcpy( p_context->intra_matrix, mpeg4_default_intra_matrix, -+ sizeof(mpeg4_default_intra_matrix)); -+ p_context->inter_matrix = av_malloc( sizeof(mpeg4_default_non_intra_matrix) ); -+ if ( p_context->inter_matrix ) -+ memcpy( p_context->inter_matrix, mpeg4_default_non_intra_matrix, -+ sizeof(mpeg4_default_non_intra_matrix)); - } - - if ( p_sys->b_pre_me ) --- -GitLab - - -From 55be3ce60795a09d13861c5637c1fe7aebc5ce8b Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Thu, 7 Dec 2023 14:18:22 +0100 -Subject: [PATCH 7/9] smb: fix potential string to wide string copy - -The type of net_resource depends on the UNICODE define. ---- - modules/access/smb.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules/access/smb.c b/modules/access/smb.c -index 5fe56f0c9dfe..6add2a3e6278 100644 ---- a/modules/access/smb.c -+++ b/modules/access/smb.c -@@ -524,7 +524,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - const char *psz_pwd, const char *psz_domain ) - { - char psz_remote[MAX_PATH]; -- NETRESOURCE net_resource; -+ NETRESOURCEA net_resource; - DWORD i_result; - VLC_UNUSED( psz_domain ); - -@@ -544,7 +544,7 @@ static void Win32AddConnection( stream_t *p_access, const char *psz_server, - - net_resource.lpRemoteName = psz_remote; - -- i_result = WNetAddConnection2( &net_resource, psz_pwd, psz_user, 0 ); -+ i_result = WNetAddConnection2A( &net_resource, psz_pwd, psz_user, 0 ); - - if( i_result != NO_ERROR ) - { --- -GitLab - - -From 5ae924bf212dce64a6424561d92426dbcc2cf3a0 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 6 Dec 2023 14:45:46 +0100 -Subject: [PATCH 8/9] dxva2: add missing mask initializers - ---- - modules/codec/avcodec/dxva2.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/modules/codec/avcodec/dxva2.c b/modules/codec/avcodec/dxva2.c -index 18b872fe0fe3..2e6809a05410 100644 ---- a/modules/codec/avcodec/dxva2.c -+++ b/modules/codec/avcodec/dxva2.c -@@ -84,12 +84,12 @@ DEFINE_GUID(DXVA_Intel_H264_NoFGT_ClearVideo, 0x604F8E68, 0x4951, 0x4c54, - - /* XXX Preferred format must come first */ - static const d3d9_format_t d3d_formats[] = { -- { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12 }, -- { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12 }, -- //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12 }, -- { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010 }, -+ { "YV12", MAKEFOURCC('Y','V','1','2'), VLC_CODEC_YV12, 0,0,0 }, -+ { "NV12", MAKEFOURCC('N','V','1','2'), VLC_CODEC_NV12, 0,0,0 }, -+ //{ "IMC3", MAKEFOURCC('I','M','C','3'), VLC_CODEC_YV12, 0,0,0 }, -+ { "P010", MAKEFOURCC('P','0','1','0'), VLC_CODEC_P010, 0,0,0 }, - -- { NULL, 0, 0 } -+ { NULL, 0, 0, 0,0,0 } - }; - - static const d3d9_format_t *D3dFindFormat(D3DFORMAT format) --- -GitLab - - -From 08c7a66780740679ba1b0abe9e30e73afc6bc271 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <robux4@ycbcr.xyz> -Date: Wed, 6 Dec 2023 07:48:29 +0100 -Subject: [PATCH 9/9] win32/modules: use cast with GetProcAddress function - pointers - ---- - src/text/url.c | 3 ++- - src/win32/plugin.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/text/url.c b/src/text/url.c -index b962eb31f849..2eb4b8d10817 100644 ---- a/src/text/url.c -+++ b/src/text/url.c -@@ -892,7 +892,8 @@ static int IdnToAscii(DWORD flags, LPCWSTR str, int len, LPWSTR buf, int size) - int (WINAPI *IdnToAsciiReal)(DWORD, LPCWSTR, int, LPWSTR, int); - int ret = 0; - -- IdnToAsciiReal = GetProcAddress(h, "IdnToAscii"); -+ IdnToAsciiReal = (int (WINAPI *)(DWORD, LPCWSTR, int, LPWSTR, int)) -+ GetProcAddress(h, "IdnToAscii"); - if (IdnToAsciiReal != NULL) - ret = IdnToAsciiReal(flags, str, len, buf, size); - else -diff --git a/src/win32/plugin.c b/src/win32/plugin.c -index 1a65521fca75..b5c336eb99ca 100644 ---- a/src/win32/plugin.c -+++ b/src/win32/plugin.c -@@ -45,7 +45,8 @@ static BOOL WINAPI SetThreadErrorModeFallback(DWORD mode, DWORD *oldmode) - - BOOL (WINAPI *SetThreadErrorModeReal)(DWORD, DWORD *); - -- SetThreadErrorModeReal = GetProcAddress(h, "SetThreadErrorMode"); -+ SetThreadErrorModeReal = (BOOL (WINAPI *)(DWORD, DWORD *)) -+ GetProcAddress(h, "SetThreadErrorMode"); - if (SetThreadErrorModeReal != NULL) - return SetThreadErrorModeReal(mode, oldmode); - --- -GitLab - diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 2a6b27add0..2d2ecc63b9 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.20.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb @@ -25,11 +25,8 @@ SRC_URI = "https://get.videolan.org/${BPN}/${PV}/${BP}.tar.xz \ file://0006-configure-Disable-incompatible-function-pointer-type.patch \ file://taglib-2.patch \ file://0001-taglib-Fix-build-on-x86-32-bit.patch \ - file://4645.patch \ - file://4665.patch \ " -SRC_URI[sha256sum] = "adc7285b4d2721cddf40eb5270cada2aaa10a334cb546fd55a06353447ba29b5" - +SRC_URI[sha256sum] = "24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0" inherit autotools-brokensep features_check gettext pkgconfig mime-xdg REQUIRED_DISTRO_FEATURES = "x11" @@ -135,3 +132,5 @@ FILES:${PN}-staticdev += "\ INSANE_SKIP:${PN} = "dev-so" EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" + +SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" diff --git a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb index c52f22aada..7c308bd485 100644 --- a/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.3.bb +++ b/meta-openembedded/meta-multimedia/recipes-multimedia/wireplumber/wireplumber_0.5.6.bb @@ -10,7 +10,7 @@ DEPENDS = "glib-2.0 glib-2.0-native lua pipewire \ ${@bb.utils.contains("DISTRO_FEATURES", "gobject-introspection-data", "python3-native python3-lxml-native doxygen-native", "", d)} \ " -SRCREV = "65e4ae83b994616401fc5859e00d5051b72518ba" +SRCREV = "141b2d5d3f793e20f94421c554d8d9c51143ce0d" SRC_URI = " \ git://gitlab.freedesktop.org/pipewire/wireplumber.git;branch=master;protocol=https \ file://90-OE-disable-session-dbus-dependent-features.lua \ diff --git a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb index 8ffe652b22..0b90bc0db9 100644 --- a/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb +++ b/meta-openembedded/meta-multimedia/recipes-support/xdg-desktop-portal-wlr/xdg-desktop-portal-wlr_0.7.0.bb @@ -20,7 +20,8 @@ SRC_URI = "git://github.com/emersion/xdg-desktop-portal-wlr.git;protocol=https;b file://0001-screencast-Fix-build-with-older-mesa.patch" S = "${WORKDIR}/git" -SRCREV = "776113a4f014639c29d8de8fcb513493ef7b491f" +PV .= "+git" +SRCREV = "d9ada849aeca6137915de2df69beaef4e272cc1d" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)}" diff --git a/meta-openembedded/meta-networking/MAINTAINERS b/meta-openembedded/meta-networking/MAINTAINERS index dc549d7582..4f7ef4e310 100644 --- a/meta-openembedded/meta-networking/MAINTAINERS +++ b/meta-openembedded/meta-networking/MAINTAINERS @@ -2,13 +2,13 @@ This file contains a list of maintainers for the meta-networking layer. Please submit any patches against meta-networking to the OpenEmbedded development mailing list (openembedded-devel@lists.openembedded.org) with -'[meta-networking]' in the subject. +'[meta-networking][styhead]' in the subject. When sending single patches, please use something like: git send-email -1 -M \ --to openembedded-devel@lists.openembedded.org \ - --subject-prefix='meta-networking][PATCH' + --subject-prefix='meta-networking][styhead][PATCH' You may also contact the maintainers directly. @@ -26,14 +26,9 @@ Please keep this list in alphabetical order. Maintainers List (try to look for most precise areas first) COMMON -M: Khem Raj <raj.khem@gmail.com> -M: "Joe MacDonald (backup)" <joe@deserted.net> +M: Armin Kuster <akuster808@gmail.com> L: openembedded-devel@lists.openembedded.org Q: https://patchwork.openembedded.org/project/oe/ S: Maintained F: conf F: recipes-* - -OPENTHREAD -M: Stefan Schmidt <stefan@datenfreihafen.org> -F: recipes-connectivity/openthread/ diff --git a/meta-openembedded/meta-networking/README.md b/meta-openembedded/meta-networking/README.md index ab2640618f..ef7933e319 100644 --- a/meta-openembedded/meta-networking/README.md +++ b/meta-openembedded/meta-networking/README.md @@ -18,21 +18,21 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: Scarthgap For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: Scarthgap URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-python -branch: master +branch: Scarthgap Maintenance ----------- -Layer maintainers: Khem Raj <raj.khem@gmail.com> +Stable Layer maintainer: Armin Kuster <akuster808@gmail.com> Please see the MAINTAINERS file for information on contacting the diff --git a/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc b/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc index 45eed5398e..c5313416a7 100755 --- a/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc +++ b/meta-openembedded/meta-networking/conf/include/non-repro-meta-networking.inc @@ -1,34 +1,19 @@ # List of known non-reproducible package of the meta-networking layer # Please keep this list sorted KNOWN_NON_REPRO_META_NETWORKING = " \ - blueman \ - blueman-dbg \ - blueman-src \ - civetweb-dev \ + babeld \ + babeld-dbg \ dhcp-relay-staticdev \ ettercap-src \ - fetchmail \ - fetchmail-dbg \ freediameter \ - freediameter-src \ freeradius \ htpdate-doc \ - keepalived \ - keepalived-dbg \ libbearssl-staticdev \ - libfko3 \ - libfko-client \ - libfko-daemon \ - libfko-dbg \ libmosquitto1 \ libowfat-staticdev \ libruli-staticdev \ - libsamba-util0 \ mosquitto \ - mosquitto-dbg \ ncftp \ - ncftp-dbg \ - ncftp-src \ ndisc6-dbg \ ndisc6-misc \ ndisc6-ndisc6 \ @@ -38,20 +23,9 @@ KNOWN_NON_REPRO_META_NETWORKING = " \ netsniff-ng-doc \ ntpsec-src \ openl2tp \ - openl2tp-dbg \ - ot-br-posix \ - ot-br-posix-dbg \ postfix-cfg \ - proftpd \ - proftpd-dbg \ - proftpd-dev \ - rdist \ - rdist-dbg \ - samba-dbg \ - tayga \ - tayga-dbg \ - wolfssl \ - wolfssl-dbg \ + rp-pppoe \ + udpcast-doc \ + unbound-doc \ znc \ - znc-doc \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch deleted file mode 100644 index 913566dce9..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-Search-for-cython3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Subject: [PATCH] Search for cython3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate - -Signed-off-by: Markus Volk <f_l_k@gmx.net> ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/module/meson.build 2022-02-10 08:49:35.000000000 +0100 -+++ b/module/meson.build 2022-03-29 12:58:03.456193737 +0200 -@@ -1,4 +1,4 @@ --cython = find_program('cython', required: true) -+cython = find_program('cython3', required: true) - - blueman_c = custom_target( - 'blueman_c', - --- -2.14.3 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch new file mode 100644 index 0000000000..6e48b70243 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-DO-not-emit-absolute-path-when-S-B.patch @@ -0,0 +1,38 @@ +From 4947abc5ede2dc356f011b7c45f6760c9c2ce9f1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 21:26:24 -0700 +Subject: [PATCH] meson: Do not emit absolute path when S != B + +build systems like OE build outside sourcetree in such cases it works +ok but cython resolves the input file to absolute path and that gets +emitted into genetate _blueman.c as module name, renders the build +non-reproducible, wish cython had a better way to handle this but there +is not, therefore tweak the meson build rule to account for specifying +workdir to cython which will search the inputs correctly, and use +meson's build_root to emit the output into build dir. This ensures that +it becomes independent of source or build directories and cython does +not generate the absolute paths into generate C code. + +See cython discussion on [1] + +[1] https://github.com/cython/cython/issues/5949 + +Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/2461] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + module/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/module/meson.build b/module/meson.build +index 096ad7c8..fddef547 100644 +--- a/module/meson.build ++++ b/module/meson.build +@@ -4,7 +4,7 @@ blueman_c = custom_target( + 'blueman_c', + output: '_blueman.c', + input: '_blueman.pyx', +- command: [cython, '--output-file', '@OUTPUT@', '@INPUT@']) ++ command: [cython, '-w', meson.source_root(), '--output-file', join_paths(meson.build_root(), '@OUTPUT@'), join_paths(meson.build_root(), '@INPUT@')]) + + sources = [ + blueman_c, diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch deleted file mode 100644 index cc448b4ffd..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0001-meson-add-pythoninstalldir-option.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 37f24a9bd62f0a8f3e37eaddd33f2f0c9d3aaa0a Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Fri, 1 Apr 2022 23:12:17 -0700 -Subject: [PATCH] meson: add pythoninstalldir option - -In case of cross build, using host python to determine the python -site-packages directory for target is not feasible, add a new option -pythoninstalldir to fix the issue. - -Upstream-Status: Submitted [https://github.com/blueman-project/blueman/pull/1699] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - meson.build | 7 ++++++- - meson_options.txt | 1 + - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index e12d0ce6..e84457a5 100644 ---- a/meson.build -+++ b/meson.build -@@ -26,7 +26,12 @@ pkgdatadir = join_paths([prefix, get_option('datadir'), package_name]) - bindir = join_paths([prefix, get_option('bindir')]) - libexecdir = join_paths([prefix, get_option('libexecdir')]) - schemadir = join_paths(['share', 'glib-2.0', 'schemas']) --pythondir = pyinstall.get_install_dir() -+pythoninstalldir = get_option('pythoninstalldir') -+if pythoninstalldir != '' -+ pythondir = join_paths([prefix, pythoninstalldir]) -+else -+ pythondir = join_paths([prefix, python.sysconfig_path('purelib')]) -+endif - - if get_option('policykit') - have_polkit = 'True' -diff --git a/meson_options.txt b/meson_options.txt -index 177d9ab8..3e397d8e 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -2,6 +2,7 @@ option('runtime_deps_check', type: 'boolean', value: true, description: 'Disable - option('dhcp-config-path', type: 'string', value: '/etc/dhcp3/dhcpd.conf', description: 'Set dhcp3 server configuration path') - option('policykit', type: 'boolean', value: true, description: 'Enable policykit support') - option('pulseaudio', type: 'boolean', value: true, description: 'Enable PulseAudio support') -+option('pythoninstalldir', type: 'string', description: 'Path to python site-packages dir relative to ${prefix}') - option('systemdsystemunitdir', type: 'string', description: 'Path to systemd system unit dir relative to ${prefix}') - option('systemduserunitdir', type: 'string', description: 'Path to systemd user unit dir relative to ${prefix}') - option('sendto-plugins', type: 'array', choices: ['Caja', 'Nemo', 'Nautilus'], value: ['Caja', 'Nemo', 'Nautilus'], description: 'Install sendto plugins for various filemanagers') --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch deleted file mode 100644 index 282d821374..0000000000 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman/0002-fix-fail-to-enable-bluetooth.patch +++ /dev/null @@ -1,72 +0,0 @@ -Fix fail to enable bluetooth issue - -When launch blueman-manager while bluetooth is disable, it may fails -with error: - - Failed to enable bluetooth - -Because when get bluetooth status right after change its status, the -status may not be updated that plugin applet/KillSwitch.py sets the -bluetooth status via method of another dbus service which doesn't return -immediately. - -Provides a new dbus method for PowerManager which checks whether dbus -method SetBluetoothStatus() has finished. Then it makes sure to get -right bluetooth status. - -Upstream-Status: Inappropriate -Send to upstream but not accepted: -https://github.com/blueman-project/blueman/pull/1121 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - blueman/Functions.py | 10 ++++++++++ - blueman/plugins/applet/PowerManager.py | 4 ++++ - 2 files changed, 14 insertions(+) - -diff --git a/blueman/Functions.py b/blueman/Functions.py -index 3917f42..b4d5eae 100644 ---- a/blueman/Functions.py -+++ b/blueman/Functions.py -@@ -80,6 +80,16 @@ def check_bluetooth_status(message: str, exitfunc: Callable[[], Any]) -> None: - return - - applet.SetBluetoothStatus('(b)', True) -+ -+ timeout = time.time() + 10 -+ while applet.GetRequestStatus(): -+ time.sleep(0.1) -+ if time.time() > timeout: -+ # timeout 5s has been set in applet/PowerManager.py -+ # so it should NOT reach timeout here -+ logging.warning('Should NOT reach timeout.') -+ break -+ - if not applet.GetBluetoothStatus(): - print('Failed to enable bluetooth') - exitfunc() -diff --git a/blueman/plugins/applet/PowerManager.py b/blueman/plugins/applet/PowerManager.py -index c2f7bc3..bf6c99f 100644 ---- a/blueman/plugins/applet/PowerManager.py -+++ b/blueman/plugins/applet/PowerManager.py -@@ -63,6 +63,7 @@ class PowerManager(AppletPlugin, StatusIconProvider): - self._add_dbus_signal("BluetoothStatusChanged", "b") - self._add_dbus_method("SetBluetoothStatus", ("b",), "", self.request_power_state) - self._add_dbus_method("GetBluetoothStatus", (), "b", self.get_bluetooth_status) -+ self._add_dbus_method("GetRequestStatus", (), "b", self.get_request_status) - - def on_unload(self) -> None: - self.parent.Plugins.Menu.unregister(self) -@@ -196,6 +197,9 @@ class PowerManager(AppletPlugin, StatusIconProvider): - def get_bluetooth_status(self) -> bool: - return self.current_state - -+ def get_request_status(self): -+ return self.request_in_progress -+ - def on_adapter_property_changed(self, _path: str, key: str, value: Any) -> None: - if key == "Powered": - if value and not self.current_state: --- -2.31.1 - diff --git a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb index 0374d23f0c..e7f0987e0f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/blueman/blueman_2.4.3.bb @@ -4,20 +4,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "gtk+3 glib-2.0 bluez5 python3-pygobject python3-cython-native" -inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache useradd features_check +inherit meson gettext systemd gsettings pkgconfig python3native gtk-icon-cache features_check python3targetconfig REQUIRED_DISTRO_FEATURES = "gobject-introspection-data" -SRC_URI = " \ - git://github.com/blueman-project/blueman.git;protocol=https;branch=2-3-stable \ - file://0001-Search-for-cython3.patch \ - file://0002-fix-fail-to-enable-bluetooth.patch \ - file://0001-meson-add-pythoninstalldir-option.patch \ -" +SRC_URI = "git://github.com/blueman-project/blueman.git;protocol=https;branch=2-4-stable \ + file://0001-meson-DO-not-emit-absolute-path-when-S-B.patch" S = "${WORKDIR}/git" -SRCREV = "c85e7afb8d6547d4c35b7b639124de8e999c3650" +SRCREV = "7bcf919ad6ac0ee9a8c66b18b0ca98af877d4c8f" -EXTRA_OEMESON = "-Druntime_deps_check=false -Dpythoninstalldir=${@noprefix('PYTHON_SITEPACKAGES_DIR', d)}" +EXTRA_OEMESON = "-Druntime_deps_check=false \ + -Dsystemdsystemunitdir=${systemd_system_unitdir} \ + -Dsystemduserunitdir=${systemd_user_unitdir} \ +" SYSTEMD_SERVICE:${PN} = "${BPN}-mechanism.service" SYSTEMD_AUTO_ENABLE:${PN} = "disable" @@ -44,6 +43,7 @@ PACKAGECONFIG[polkit] = "-Dpolicykit=true,-Dpolicykit=false" FILES:${PN} += " \ ${datadir} \ ${systemd_user_unitdir} \ + ${systemd_system_unitdir} \ ${PYTHON_SITEPACKAGES_DIR} \ " @@ -60,29 +60,3 @@ do_install:append() { ${D}${bindir}/blueman-services \ ${D}${bindir}/blueman-tray } - -do_install:append() { - install -d ${D}${datadir}/polkit-1/rules.d - cat >${D}${datadir}/polkit-1/rules.d/51-blueman.rules <<EOF -/* Allow users in wheel group to use blueman feature requiring root without authentication */ -polkit.addRule(function(action, subject) { - if ((action.id == "org.blueman.network.setup" || - action.id == "org.blueman.dhcp.client" || - action.id == "org.blueman.rfkill.setstate" || - action.id == "org.blueman.pppd.pppconnect") && - subject.isInGroup("wheel")) { - - return polkit.Result.YES; - } -}); -EOF -} - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" - -do_install:append() { - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d -} diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb index 8cb4c04fa3..a686ef5840 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/daq_2.0.7.bb @@ -8,12 +8,12 @@ PARALLEL_MAKE = "" DEPENDS = "libpcap libpcre libdnet bison-native libnetfilter-queue" -SRC_URI = "http://fossies.org/linux/misc/daq-${PV}.tar.gz \ +SRC_URI = "https://www.snort.org/downloads/snort/${BPN}-${PV}.tar.gz;downloadfilename=${BPN}-${PV}_snort_org.tar.gz \ file://disable-run-test-program-while-cross-compiling.patch \ file://0001-correct-the-location-of-unistd.h.patch \ file://daq-fix-incompatible-pointer-type-error.patch \ " -SRC_URI[sha256sum] = "bdc4e5a24d1ea492c39ee213a63c55466a2e8114b6a9abed609927ae13a7705e" +SRC_URI[sha256sum] = "d1f6709bc5dbddee3fdf170cdc1e49fb926e2031d4869ecf367a8c47efc87279" # these 2 create undeclared dependency on libdnet and libnetfilter-queue from meta-networking # this error from test-dependencies script: # daq/daq/latest lost dependency on libdnet libmnl libnetfilter-queue libnfnetlink diff --git a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb index 74964e0741..7834d75552 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.14.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/daq/libdaq_3.0.16.bb @@ -11,7 +11,8 @@ inherit autotools pkgconfig SRC_URI = "git://github.com/snort3/libdaq.git;protocol=https;branch=master \ file://0001-example-Use-lm-for-the-fst-module.patch" -SRCREV = "4e68d7ba6940df9a1503599d7b177029112d6b6a" + +SRCREV = "2ffe084d4d4ccf4ebc5c23ef119aa1ae223ce2ae" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb index 34f8a7e3e5..cc36fbd4f0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/dibbler/dibbler_git.bb @@ -41,3 +41,7 @@ FILES:${PN}-client = "${sbindir}/${PN}-client" FILES:${PN}-relay = "${sbindir}/${PN}-relay" FILES:${PN}-requestor = "${sbindir}/${PN}-requestor" FILES:${PN}-server = "${sbindir}/${PN}-server" + +# http://errors.yoctoproject.org/Errors/Details/766880/ +# git/Port-linux/interface.c:118:18: error: assignment to '__caddr_t' {aka 'char *'} from incompatible pointer type 'struct ethtool_value *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb index 8397380c1d..ec68c1d920 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/freeradius/freeradius_3.2.5.bb @@ -39,7 +39,7 @@ SRC_URI = "git://github.com/FreeRADIUS/freeradius-server.git;branch=v3.2.x;lfs=0 raddbdir = "${sysconfdir}/${MLPREFIX}raddb" -SRCREV = "db3d1924d9a2e8d37c43872932621f69cfdbb099" +SRCREV = "a7acce80f5ba2271d9aeb737a4a91a5bf8317f31" UPSTREAM_CHECK_GITTAGREGEX = "release_(?P<pver>\d+(\_\d+)+)" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb index db79241f2a..abb5ad2442 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.8.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_2.28.9.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRCREV = "5a764e5555c64337ed17444410269ff21cb617b1" +SRCREV = "5e146adef63b326b04282252639bebc2730939c6" SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-2.28 \ file://run-ptest \ " diff --git a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb index 7011d54f35..62c3add2a5 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/mbedtls/mbedtls_3.6.1.bb @@ -23,12 +23,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=379d5819937a6c2f1ef1630d341e026d" SECTION = "libs" S = "${WORKDIR}/git" -SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/Mbed-TLS/mbedtls.git;protocol=https;branch=mbedtls-3.6 \ git://github.com/Mbed-TLS/mbedtls-framework.git;protocol=https;branch=main;destsuffix=git/framework;name=framework \ file://run-ptest" -SRCREV = "2ca6c285a0dd3f33982dd57299012dacab1ff206" -SRCREV_framework = "750634d3a51eb9d61b59fd5d801546927c946588" +SRCREV = "71c569d44bf3a8bd53d874c81ee8ac644dd6e9e3" +SRCREV_framework = "94599c0e3b5036e086446a51a3f79640f70f22f6" SRCREV_FORMAT .= "_framework" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" @@ -74,7 +74,8 @@ sysroot_stage_all:append() { do_install_ptest () { install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/framework cp -f ${B}/tests/test_suite_* ${D}${PTEST_PATH}/tests/ find ${D}${PTEST_PATH}/tests/ -type f -name "*.c" -delete - cp -fR ${S}/tests/data_files ${D}${PTEST_PATH}/tests/ + cp -fR ${S}/framework/data_files ${D}${PTEST_PATH}/framework/ } diff --git a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb index a6556249b7..9ae3b89371 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/nanomsg/nng_1.7.3.bb @@ -5,7 +5,7 @@ SECTION = "libs/networking" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41e579bb4326c21c774f8e51e41d8a3" -SRC_URI = "git://github.com/nanomsg/nng.git;branch=master;protocol=https" +SRC_URI = "git://github.com/nanomsg/nng.git;branch=main;protocol=https" SRCREV = "85fbe7f9e4642b554d0d97f2e3ff2aa12978691a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb index f44526ff98..2d2055ba65 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.11.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager-openvpn_1.12.0.bb @@ -13,7 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/NetworkManager-openvpn/${@gnome_verdir("${PV}")}/Netw SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "2128de06f91b33c13d63cdaa6e178bc1ca57fc770cde3bc7c24891f4d9824501" +SRC_URI[sha256sum] = "903fd4c0aebd2aa7ac70c9d8c2bed8df922655d22d764514403566ae89b7e886" S = "${WORKDIR}/NetworkManager-openvpn-${PV}" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb index 47287951f5..a9b9233b7e 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.48.10.bb @@ -44,7 +44,7 @@ SRC_URI = " \ " SRC_URI:append:libc-musl = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-lld', ' file://0001-linker-scripts-Do-not-export-_IO_stdin_used.patch', '', d)}" -SRC_URI[sha256sum] = "fc80b942de38e329468e6fc1dfb40aad6a78d02ddf6b8ec31f9acc6460b8723f" +SRC_URI[sha256sum] = "5dc188fdffcf2d23c89d34b1e6319a6b20203e12eaec24b30037b7ea8ac8c613" S = "${WORKDIR}/NetworkManager-${PV}" @@ -102,7 +102,7 @@ PACKAGECONFIG[polkit] = "-Dpolkit=true,-Dpolkit=false,polkit" PACKAGECONFIG[bluez5] = "-Dbluez5_dun=true,-Dbluez5_dun=false,bluez5" # consolekit is not picked by shlibs, so add it to RDEPENDS too PACKAGECONFIG[consolekit] = "-Dsession_tracking_consolekit=true,-Dsession_tracking_consolekit=false,consolekit,consolekit" -PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info,modemmanager mobile-broadband-provider-info" +PACKAGECONFIG[modemmanager] = "-Dmodem_manager=true,-Dmodem_manager=false,modemmanager mobile-broadband-provider-info" PACKAGECONFIG[ppp] = "-Dppp=true -Dpppd=${sbindir}/pppd,-Dppp=false,ppp" PACKAGECONFIG[dnsmasq] = "-Ddnsmasq=${bindir}/dnsmasq" PACKAGECONFIG[nss] = "-Dcrypto=nss,,nss" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb index d7be1cd71d..ec930de275 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb @@ -29,11 +29,15 @@ inherit pkgconfig cmake systemd # for (uint8_t i = 0;; i++) CXXFLAGS:append:libc-musl:toolchain-clang = " -Wno-error=sign-compare -Wno-error=unused-but-set-variable" +LDFLAGS:append:riscv32 = " -latomic" + EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ -DOTBR_DBUS=ON \ -DOTBR_REST=ON \ -DOTBR_WEB=OFF \ -DCMAKE_LIBRARY_PATH=${libdir} \ + -DOT_POSIX_PRODUCT_CONFIG=${sysconfdir}/openthread.conf.example \ + -DOT_POSIX_FACTORY_CONFIG=${sysconfdir}/openthread.conf.example \ -DOTBR_MDNS=avahi \ -DOTBR_BACKBONE_ROUTER=ON \ -DOTBR_BORDER_ROUTING=ON \ @@ -63,3 +67,7 @@ RCONFLICTS:${PN} = "ot-daemon" FILES:${PN} += "${systemd_unitdir}/*" FILES:${PN} += "${datadir}/*" + +# http://errors.yoctoproject.org/Errors/Details/766903/ +# git/third_party/openthread/repo/src/core/border_router/routing_manager.hpp:615:11: error: 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable' declared with greater visibility than the type of its field 'ot::BorderRouter::RoutingManager::DiscoveredPrefixTable::mEntryTimer' [-Werror=attributes] +CXXFLAGS += "-Wno-error=attributes" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb index d81cc9a3d1..e6d99431be 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/rdist/rdist_6.1.5.bb @@ -38,7 +38,7 @@ DEPENDS = "bison-native" inherit autotools-brokensep -EXTRA_OEMAKE = "BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" +EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' BIN_GROUP=root MAN_GROUP=root RDIST_MODE=755 RDISTD_MODE=755 MAN_MODE=644" # http://errors.yoctoproject.org/Errors/Details/186972/ COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb index 7bdcfd35c0..09d5608df0 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.6.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/samba/samba_4.19.8.bb @@ -31,7 +31,7 @@ SRC_URI:append:libc-musl = " \ file://samba-4.3.9-remove-getpwent_r.patch \ " -SRC_URI[sha256sum] = "653b52095554dbc223c63b96af5cdf9e98c3e048549c5f56143d3b33dce1cef1" +SRC_URI[sha256sum] = "1aeff76c207f383477ce4badebd154691c408d2e15b01b333c85eb775468ddf6" UPSTREAM_CHECK_REGEX = "samba\-(?P<pver>4\.19(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch index ec7b90cfb4..626f412731 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3/0001-cmake-Pass-noline-flag-to-flex.patch @@ -8,6 +8,7 @@ could be absolute build paths, since these files end up in dbg packages this can be flagged as a build/packaging warning. Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- cmake/configure_options.cmake | 2 +- diff --git a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb index ee84aa17e7..0f3d0e986f 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.1.84.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/snort/snort3_3.3.4.0.bb @@ -10,7 +10,8 @@ DEPENDS = "flex-native hwloc libdaq libdnet libpcap libpcre libtirpc libunwind l SRC_URI = "git://github.com/snort3/snort3.git;protocol=https;branch=master \ file://0001-cmake-Check-for-HP-libunwind.patch \ file://0001-cmake-Pass-noline-flag-to-flex.patch" -SRCREV = "e7312efd840d66a52a2019abe1db7cc89ca0f39a" + +SRCREV = "5598e8dd87829cb1bbb478a7b6d4f6fb8b5dabfe" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb index f6b58559d4..f36435c8ea 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/tayga/tayga_0.9.2.bb @@ -12,6 +12,8 @@ SRC_URI[sha256sum] = "2b1f7927a9d2dcff9095aff3c271924b052ccfd2faca9588b277431a44 SYSTEMD_PACKAGES = "${PN}" SYSTEMD_SERVICE:${PN} = "tayga.service" +EXTRA_OEMAKE += "CFLAGS='${CFLAGS}'" + do_install:append() { install -m 0644 ${UNPACKDIR}/tayga.conf ${D}${sysconfdir}/tayga.conf install -d ${D}${systemd_unitdir}/system/ @@ -19,3 +21,4 @@ do_install:append() { } inherit autotools systemd + diff --git a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb index 47c14dd1a1..009434d96a 100644 --- a/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.0.bb +++ b/meta-openembedded/meta-networking/recipes-connectivity/wolfssl/wolfssl_5.7.2.bb @@ -13,10 +13,13 @@ PROVIDES += "cyassl" RPROVIDES:${PN} = "cyassl" SRC_URI = "git://github.com/wolfSSL/wolfssl.git;protocol=https;branch=master" -SRCREV = "8970ff4c34034dbb3594943d11f8c9d4c5512bd5" +SRCREV = "00e42151ca061463ba6a95adb2290f678cbca472" S = "${WORKDIR}/git" inherit autotools +PACKAGECONFIG ?= "reproducible-build" + +PACKAGECONFIG[reproducible-build] = "--enable-reproducible-build,--disable-reproducible-build," BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch deleted file mode 100644 index 2a583466e3..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Bug-fix-for-pid_t-not-found-on-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -From d0d5ac317dab11610a5fc91ca3e7f5ad72ce2236 Mon Sep 17 00:00:00 2001 -From: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> -Date: Tue, 29 Oct 2019 13:19:37 +0800 -Subject: [PATCH] Bug fix for pid_t not found on musl. - -When compiling version 5.1.6 on musl, the following error occurs: -log.h:49:8: error: unknown type name 'pid_t' - -Upstream-Status: Pending - -Signed-off-by: Zang Ruochen <zangrc.fnst@cn.fujitsu.com> ---- - lib/defaults.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/defaults.c b/lib/defaults.c -index a6ea116..b3ecfa5 100644 ---- a/lib/defaults.c -+++ b/lib/defaults.c -@@ -21,6 +21,7 @@ - #include <string.h> - #include <sys/utsname.h> - #include <sys/stat.h> -+#include <sys/types.h> - #include <stdarg.h> - - #include "config.h" --- -2.20.1 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch deleted file mode 100644 index 6128f3d0ed..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 987c8f4a718cdd6b764592ba7510090a59623959 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 31 Mar 2017 19:10:57 -0700 -Subject: [PATCH] Define __SWORD_TYPE and _PATH_NSSWITCH_CONF - -if they are not defined as is in musl then define -them here - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- -Upstream-Status: Pending - - include/automount.h | 8 ++++++++ - include/nsswitch.h | 3 +++ - 2 files changed, 11 insertions(+) - -diff --git a/include/automount.h b/include/automount.h -index cc336ad..8bdcf12 100644 ---- a/include/automount.h -+++ b/include/automount.h -@@ -42,6 +42,14 @@ - - #define ENABLE_CORES 1 - -+#ifndef __SWORD_TYPE -+# if __WORDSIZE == 32 /* System word size */ -+# define __SWORD_TYPE int -+# else /* __WORDSIZE == 64 */ -+# define __SWORD_TYPE long int -+# endif -+#endif -+ - /* We MUST have the paths to mount(8) and umount(8) */ - #ifndef HAVE_MOUNT - #error Failed to locate mount(8)! -diff --git a/include/nsswitch.h b/include/nsswitch.h -index d3e4027..7a0c38f 100644 ---- a/include/nsswitch.h -+++ b/include/nsswitch.h -@@ -24,6 +24,9 @@ - #include <netdb.h> - #include "list.h" - -+#ifndef _PATH_NSSWITCH_CONF -+#define _PATH_NSSWITCH_CONF "/etc/nsswitch.conf" -+#endif - #define NSSWITCH_FILE _PATH_NSSWITCH_CONF - - enum nsswitch_status { diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch deleted file mode 100644 index f16ae5277e..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Define-__SWORD_TYPE-if-undefined.patch +++ /dev/null @@ -1,115 +0,0 @@ -From 9fe90ab1e333b2e2bed370ff13ba552eb54c3aaf Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 17 Jul 2021 09:56:28 -0700 -Subject: [PATCH] Define __SWORD_TYPE if undefined - -These fixes are inspired when building autofs on musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - daemon/automount.c | 20 ++++++++++++++------ - include/hash.h | 5 +++++ - lib/log.c | 6 +++++- - 3 files changed, 24 insertions(+), 7 deletions(-) - ---- a/daemon/automount.c -+++ b/daemon/automount.c -@@ -1,7 +1,7 @@ - /* ----------------------------------------------------------------------- * - * - * automount.c - Linux automounter daemon -- * -+ * - * Copyright 1997 Transmeta Corporation - All Rights Reserved - * Copyright 1999-2000 Jeremy Fitzhardinge <jeremy@goop.org> - * Copyright 2001-2005 Ian Kent <raven@themaw.net> -@@ -11,7 +11,7 @@ - * the Free Software Foundation, Inc., 675 Mass Ave, Cambridge MA 02139, - * USA; either version 2 of the License, or (at your option) any later - * version. -- * -+ * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -@@ -40,6 +40,14 @@ - #include <systemd/sd-daemon.h> - #endif - -+#ifndef __SWORD_TYPE -+# if __WORDSIZE == 32 /* System word size */ -+# define __SWORD_TYPE int -+# else /* __WORDSIZE == 64 */ -+# define __SWORD_TYPE long int -+# endif -+#endif -+ - #include "automount.h" - #if defined(LIBXML2_WORKAROUND) || defined(TIRPC_WORKAROUND) - #include <dlfcn.h> -@@ -282,7 +290,7 @@ int rmdir_path(struct autofs_point *ap, - dev, buf, st.st_dev); - return -1; - } -- -+ - /* - * Last element of path may be a symbolic link; all others - * are directories (and the last directory element is -@@ -455,7 +463,7 @@ int count_mounts(struct autofs_point *ap - - counter.count = 0; - counter.dev = dev; -- -+ - if (walk_tree(path, counter_fn, 1, ap, &counter) == -1) - return -1; - -@@ -811,7 +819,7 @@ static char *automount_path_to_fifo(unsi - /* - * An automount path can be made up of subdirectories. So, to - * create the fifo name, we will just replace instances of '/' with -- * '-'. -+ * '-'. - */ - p = fifo_name + strlen(fifodir); - while (*p != '\0') { -@@ -1640,7 +1648,7 @@ static void return_start_status(void *ar - sc->done = 1; - - /* -- * Startup condition mutex must be locked during -+ * Startup condition mutex must be locked during - * the startup process. - */ - status = pthread_cond_signal(&sc->cond); ---- a/include/hash.h -+++ b/include/hash.h -@@ -5,6 +5,11 @@ - - #include <sys/types.h> - #include <stdint.h> -+#include <linux/stddef.h> -+ -+#ifndef __GLIBC__ -+#include <sys/reg.h> -+#endif - - /* - * The "GOLDEN_RATIO_PRIME" is used in ifs/btrfs/brtfs_inode.h and ---- a/lib/log.c -+++ b/lib/log.c -@@ -38,7 +38,11 @@ static char *prepare_attempt_prefix(cons - char buffer[ATTEMPT_ID_SIZE + 1]; - char *prefixed_msg = NULL; - -- attempt_id = pthread_getspecific(key_thread_attempt_id); -+ if (key_thread_attempt_id) { -+ attempt_id = pthread_getspecific(key_thread_attempt_id); -+ } else { -+ attempt_id = 0; -+ } - if (attempt_id) { - int len = sizeof(buffer) + 1 + strlen(msg) + 1; - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch deleted file mode 100644 index f18f237d98..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-Do-not-hardcode-path-for-pkg.m4.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d7a34bb388e33d16260b67275cdb58f9c877d324 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:27:47 +0800 -Subject: [PATCH] From 6d24365f0828185fd1bb4d199209ca07eb95c41d Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 24 Aug 2018 - 06:24:36 +0000 Subject: [PATCH] Do not hardcode path for pkg.m4 - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -update patch to version 5.1.6 -Signed-off-by: Changqing Li <changqing.li@windriver.com> - ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 07c2051..e85d718 100644 ---- a/configure.in -+++ b/configure.in -@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl - AC_INIT(.autofs-5.1.8) - - # for pkg-config macros --m4_include([/usr/share/aclocal/pkg.m4]) -+m4_include([pkg.m4]) - - # - # autofs installs by default in /usr diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch deleted file mode 100644 index caf0105118..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 88f991b0ebb6fb8fcaad3d0eb8fb51a7439d053e Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <grobian@gentoo.org> -Date: Wed, 2 Feb 2022 09:27:13 +0800 -Subject: [PATCH 1/2] autofs-5.1.8 - add autofs_strerror_r() helper for musl - -If using musl libc the XSI-compliant variant strerror_r() which returns -an integer instead of a pointer so add a helper function to handle this -case. - -Signed-off-by: Fabian Groffen <grobian@gentoo.org> -Signed-off-by: Ian Kent <raven@themaw.net> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - include/automount.h | 5 +++++ - lib/log.c | 10 ++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/include/automount.h b/include/automount.h -index 8cd8b3a..f759e59 100644 ---- a/include/automount.h -+++ b/include/automount.h -@@ -51,6 +51,11 @@ - # endif - #endif - -+#ifndef __GLIBC__ -+# define strerror_r(N,B,S) autofs_strerror_r(N,B,S) -+char *autofs_strerror_r(int errnum, char *buf, size_t buflen); /* GNU */ -+#endif -+ - /* We MUST have the paths to mount(8) and umount(8) */ - #ifndef HAVE_MOUNT - #error Failed to locate mount(8)! -diff --git a/lib/log.c b/lib/log.c -index 39b1e3b..b99fa39 100644 ---- a/lib/log.c -+++ b/lib/log.c -@@ -368,3 +368,13 @@ pid_t log_pidinfo(struct autofs_point *ap, pid_t pid, char *label) { - - return ppid; - } -+ -+#ifndef __GLIBC__ -+# undef strerror_r -+char *autofs_strerror_r(int errnum, char *buf, size_t buflen) { -+ int s = strerror_r(errnum, buf, buflen); -+ if (s) -+ return NULL; -+ return buf; -+} -+#endif --- -2.37.3 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch deleted file mode 100644 index 8eec3014a0..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 745e355ac8b595a27e1fcca75bf01d3e244f4a5f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 7 Sep 2017 22:22:31 -0700 -Subject: [PATCH] modules/lookup_multi.c: Replace __S_IEXEC with S_IEXEC - -__S_IEXEC is internal to libc and may not be available on -all libc e.g. musl - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- -Upstream-Status: Pending - - modules/lookup_multi.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/lookup_multi.c b/modules/lookup_multi.c -index 3ecda6d..cf109de 100644 ---- a/modules/lookup_multi.c -+++ b/modules/lookup_multi.c -@@ -452,7 +452,7 @@ int lookup_reinit(const char *my_mapfmt, - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch index f91c307d34..cd9b14358a 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/no-bash.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-no-bash.patch @@ -1,16 +1,18 @@ -From a3007d7ea930823926611081bb873ddd771325cb Mon Sep 17 00:00:00 2001 +From f53458e0b4cca0b0eedcd00b0e90b39d91228085 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Sat, 5 Jan 2013 19:53:10 -0800 +Subject: [PATCH] no bash ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- samples/auto.net | 2 +- samples/auto.smb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/auto.net b/samples/auto.net -index 0384f61..61215f6 100755 +index c5b145d..a09d56d 100755 --- a/samples/auto.net +++ b/samples/auto.net @@ -1,4 +1,4 @@ @@ -20,7 +22,7 @@ index 0384f61..61215f6 100755 # This file must be executable to work! chmod 755! diff --git a/samples/auto.smb b/samples/auto.smb -index 6af5d85..d296b81 100755 +index f6d41d3..0d945ee 100755 --- a/samples/auto.smb +++ b/samples/auto.smb @@ -1,4 +1,4 @@ @@ -29,3 +31,6 @@ index 6af5d85..d296b81 100755 # This file must be executable to work! chmod 755! +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch deleted file mode 100644 index d67f6300c8..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-Replace-__S_IEXEC-with-S_IEXEC.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 096e33743158e0e8c04d60d01cc66e2945d79777 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 16:52:35 +0800 -Subject: [PATCH] From 557ca399f4b3a397f20bb147ec6dc4ab9732dd1e Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 31 Mar 2017 - 19:12:10 -0700 Subject: [PATCH] Replace __S_IEXEC with S_IEXEC - -S_IEXEC is portable - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -update patch to version 5.1.5 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- -Upstream-Status: Pending - - daemon/lookup.c | 6 +++--- - modules/lookup_multi.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - ---- a/daemon/lookup.c -+++ b/daemon/lookup.c -@@ -397,7 +397,7 @@ static int read_file_source_instance(str - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -930,7 +930,7 @@ static int lookup_name_file_source_insta - return NSS_STATUS_NOTFOUND; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; -@@ -1077,7 +1077,7 @@ static struct map_source *lookup_get_map - if (!S_ISREG(st.st_mode)) - return NULL; - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = "program"; - else - type = "file"; ---- a/modules/lookup_multi.c -+++ b/modules/lookup_multi.c -@@ -247,7 +247,7 @@ static struct lookup_mod *nss_open_looku - continue; - } - -- if (st.st_mode & __S_IEXEC) -+ if (st.st_mode & S_IEXEC) - type = src_prog; - else - type = src_file; diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch deleted file mode 100644 index 9d0caae312..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 1c0b0b70a276280f431d72319109a0bbc0267970 Mon Sep 17 00:00:00 2001 -From: Fabian Groffen <grobian@gentoo.org> -Date: Wed, 2 Feb 2022 10:15:22 +0800 -Subject: [PATCH 2/2] autofs-5.1.8 - handle innetgr() not present in musl - -The function innetgr(3) may not be present in musl libc, add a check -for this. - -Originally contributed by Fabian, modified by me. - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=f60e40af3c038b8955325a11b7294ad38c15c9e8] -Signed-off-by: Fabian Groffen <grobian@gentoo.org> -Signed-off-by: Ian Kent <raven@themaw.net> -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 6 ++++++ - configure.in | 2 +- - include/config.h.in | 3 +++ - modules/parse_amd.c | 7 +++++++ - 4 files changed, 17 insertions(+), 1 deletion(-) - ---- a/configure.in -+++ b/configure.in -@@ -169,7 +169,7 @@ AF_CHECK_SSS_LIB(SSS_AUTOFS, libsss_auto - AC_SUBST(HAVE_SSS_AUTOFS) - AC_SUBST(sssldir) - --AC_CHECK_FUNCS(pipe2) -+AC_CHECK_FUNCS(pipe2 innetgr) - - # - # Newer mounts have the -s (sloppy) option to ignore unknown options, ---- a/include/config.h.in -+++ b/include/config.h.in -@@ -30,6 +30,9 @@ - /* Define to 1 if you have the `getservbyname' function. */ - #undef HAVE_GETSERVBYNAME - -+/* Define to 1 if you have the `innetgr' function. */ -+#undef HAVE_INNETGR -+ - /* Define to 1 if you have the <inttypes.h> header file. */ - #undef HAVE_INTTYPES_H - -@@ -45,9 +48,6 @@ - /* Define if you have the Linux /proc filesystem. */ - #undef HAVE_LINUX_PROCFS - --/* Define to 1 if you have the <memory.h> header file. */ --#undef HAVE_MEMORY_H -- - /* define if you have MOUNT */ - #undef HAVE_MOUNT - -@@ -69,6 +69,9 @@ - /* Define to 1 if you have the <stdint.h> header file. */ - #undef HAVE_STDINT_H - -+/* Define to 1 if you have the <stdio.h> header file. */ -+#undef HAVE_STDIO_H -+ - /* Define to 1 if you have the <stdlib.h> header file. */ - #undef HAVE_STDLIB_H - -@@ -141,7 +144,9 @@ - /* define if you have YACC */ - #undef PATH_YACC - --/* Define to 1 if you have the ANSI C header files. */ -+/* Define to 1 if all of the C90 standard headers exist (not just the ones -+ required in a freestanding environment). This macro is provided for -+ backward compatibility; new code need not use it. */ - #undef STDC_HEADERS - - /* Define to 1 to use the libtirpc tsd usage workaround */ ---- a/modules/parse_amd.c -+++ b/modules/parse_amd.c -@@ -424,6 +424,7 @@ static int sel_in_network(struct autofs_ - return ret; - } - -+#ifdef HAVE_INNETGR - static int sel_netgrp(struct autofs_point *ap, - struct selector *s, struct substvar *sv) - { -@@ -488,6 +489,7 @@ out: - - return ret; - } -+#endif - - static int eval_selector(struct autofs_point *ap, - struct amd_entry *this, struct substvar *sv) -@@ -627,7 +629,12 @@ static int eval_selector(struct autofs_p - switch (s->sel->selector) { - case SEL_NETGRP: - case SEL_NETGRPD: -+#ifndef HAVE_INNETGR -+ error(logopt, MODPREFIX -+ "netgroups not available, function innetgr(3) not available"); -+#else - ret = sel_netgrp(ap, s, sv); -+#endif - break; - - default: diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch index 41de373fd4..1bf95b8a45 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/using-pkg-config-to-detect-libxml-2.0-and-krb5.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0002-using-pkg-config-to-detect-krb5.patch @@ -1,10 +1,7 @@ -From dd90a690f95569b999b8ac9ab57e834b3421dcbb Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:19:07 +0800 -Subject: [PATCH] From dabcbdae38038a8e4ad2c4286112381c407c5ce7 Mon Sep 17 - 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 - 11:31:35 +0800 Subject: [PATCH] using pkg-config to detect libxml-2.0 and - krb5 +From 796f1b5cfca595ba4e11ca9dab5c2c46c0710d95 Mon Sep 17 00:00:00 2001 +From: Roy Li <rongqing.li@windriver.com> +Date: Tue, 19 Aug 2014 11:31:35 +0800 +Subject: [PATCH] using pkg-config to detect krb5 Upstream-Status: Pending @@ -13,15 +10,17 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> update patch to 5.1.5 Signed-off-by: Changqing Li <changqing.li@windriver.com> --- - configure.in | 16 ++++++++++++++-- - 1 file changed, 14 insertions(+), 2 deletions(-) + configure.ac | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) ---- a/configure.in -+++ b/configure.in -@@ -215,7 +215,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ +diff --git a/configure.ac b/configure.ac +index 76a38f4..1bb1a52 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -214,7 +214,14 @@ PKG_CHECK_MODULES([XML], [libxml-2.0], [ AC_DEFINE(LIBXML2_WORKAROUND, 1, [Use libxml2 tsd usage workaround]) ], [HAVE_LIBXML=0]) - + -AF_CHECK_KRB5() +PKG_CHECK_MODULES(KRB5, [krb5], [ + HAVE_KRB5=1 @@ -31,6 +30,9 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> + LIBS="$LIBS $KRB5_LIBS" + AC_CHECK_FUNCS([krb5_principal_get_realm]) +], [HAVE_KRB5=0]) - + AC_SEARCH_LIBS([versionsort],[]) if test "$ac_cv_search_versionsort" = "no"; then +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch index 1fc500319e..942f38d8b0 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/force-STRIP-to-emtpy.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0003-force-STRIP-to-emtpy.patch @@ -1,23 +1,22 @@ -From 3cbee00fe5725b87abdae80cfa2ee735e4513ca6 Mon Sep 17 00:00:00 2001 +From efacbbe29b7212735046a7d0f2cd61148546ce9e Mon Sep 17 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Tue, 19 Aug 2014 11:31:35 +0800 -Subject: [PATCH] [PATCH] force STRIP to emtpy +Subject: [PATCH] force STRIP to emtpy otherwise the generate file will be stripped -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- Upstream-Status: Pending +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- Makefile.rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.rules b/Makefile.rules -index 709dd04..b1f7e50 100644 +index 6ce39e5..a6dcd7b 100644 --- a/Makefile.rules +++ b/Makefile.rules -@@ -31,7 +31,7 @@ LDFLAGS ?= -s +@@ -36,7 +36,7 @@ LDFLAGS ?= -s endif ifdef DONTSTRIP @@ -26,3 +25,6 @@ index 709dd04..b1f7e50 100644 else STRIP ?= strip --strip-debug endif +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch index 4183069bb1..6065bc71bf 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/remove-bashism.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0004-autofs.init.in-remove-bashism.patch @@ -1,4 +1,4 @@ -From cfacbb917f87b903b50132a5025f86b0cc522e9c Mon Sep 17 00:00:00 2001 +From b5f4a3c2f02244209ac613aeb8ea406bdc39af27 Mon Sep 17 00:00:00 2001 From: Robert Yang <liezhi.yang@windriver.com> Date: Sat, 13 Sep 2014 20:19:28 -0700 Subject: [PATCH] autofs.init.in: remove bashism @@ -9,7 +9,6 @@ Upstream-Status: Pending Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - --- redhat/autofs.init.in | 12 ++++++------ samples/rc.autofs.in | 10 +++++----- @@ -116,3 +115,6 @@ index 487669f..e96cde1 100644 pid=`pidof $prog` if [ -z $pid ]; then echo $"$prog not running" +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch index fd736296a5..462644b011 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix-the-YACC-rule-to-fix-a-building-failure.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0005-fix-the-YACC-rule-to-fix-a-building-failure.patch @@ -1,9 +1,7 @@ -From 971d48a00ef82880c34e89778bf430a01360ebd5 Mon Sep 17 00:00:00 2001 +From 40318f4f6109d9810b7cb31518a7879ae7632f58 Mon Sep 17 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Mon, 18 May 2015 16:28:36 +0800 -Subject: [PATCH] [PATCH] fix the YACC rule to fix a building failure - -Upstream-Statu: Pending +Subject: [PATCH] fix the YACC rule to fix a building failure The original rule will create the header file twice, one is that the header file as the object file is created, other time is when create the C source file. @@ -16,18 +14,35 @@ This lead to a race when compile amd_tok.o, the header file maybe rewritten. | ^ |../Makefile.rules:64: recipe for target 'amd_tok.o' failed |---------------------- -Signed-off-by: Roy Li <rongqing.li@windriver.com> ---- Upstream-Status: Pending - lib/Makefile | 6 ++++-- +Signed-off-by: Roy Li <rongqing.li@windriver.com> +--- + daemon/Makefile | 3 ++- + lib/Makefile | 3 ++- modules/Makefile | 3 ++- - 2 files changed, 6 insertions(+), 3 deletions(-) + 3 files changed, 6 insertions(+), 3 deletions(-) +diff --git a/daemon/Makefile b/daemon/Makefile +index 3af38e6..2a7ffe9 100644 +--- a/daemon/Makefile ++++ b/daemon/Makefile +@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) + master_tok.c: master_tok.l + $(LEX) -o$@ -Pmaster_ $? + +-master_parse.tab.c master_parse.tab.h: master_parse.y ++master_parse.tab.h: master_parse.tab.c ++master_parse.tab.c: master_parse.y + $(YACC) -v -d -p master_ -b master_parse $? + + master_tok.o: master_tok.c master_parse.tab.h +diff --git a/lib/Makefile b/lib/Makefile +index d18c67b..51445fd 100644 --- a/lib/Makefile +++ b/lib/Makefile -@@ -53,7 +53,8 @@ mount_xdr.o: mount_xdr.c +@@ -35,7 +35,8 @@ libautofs.so: $(OBJS) nss_tok.c: nss_tok.l $(LEX) -o$@ -Pnss_ $? @@ -37,9 +52,11 @@ Upstream-Status: Pending $(YACC) -v -d -p nss_ -b nss_parse $? nss_tok.o: nss_tok.c nss_parse.tab.h +diff --git a/modules/Makefile b/modules/Makefile +index 6908da0..00dd7ce 100644 --- a/modules/Makefile +++ b/modules/Makefile -@@ -103,7 +103,8 @@ amd_tok.c: amd_tok.l +@@ -105,7 +105,8 @@ amd_tok.c: amd_tok.l amd_tok.o: amd_tok.c amd_parse.tab.h @@ -49,30 +66,6 @@ Upstream-Status: Pending $(YACC) -v -d -p amd_ -b amd_parse $? amd_parse.tab.o: amd_parse.tab.c amd_parse.tab.h ---- a/daemon/Makefile -+++ b/daemon/Makefile -@@ -16,7 +16,7 @@ YACCSRC = master_tok.c master_parse.tab. - version := $(shell cat ../.version) - - CFLAGS += -rdynamic $(DAEMON_CFLAGS) -D_GNU_SOURCE -I../include --CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" -+CFLAGS += -DAUTOFS_LIB_DIR=\"$(autofslibdir)\" - CFLAGS += -DAUTOFS_MAP_DIR=\"$(autofsmapdir)\" - CFLAGS += -DAUTOFS_CONF_DIR=\"$(autofsconfdir)\" - CFLAGS += -DAUTOFS_FIFO_DIR=\"$(autofsfifodir)\" -@@ -44,7 +44,8 @@ automount: $(OBJS) $(AUTOFS_LIB) - master_tok.c: master_tok.l - $(LEX) -o$@ -Pmaster_ $? - --master_parse.tab.c master_parse.tab.h: master_parse.y -+master_parse.tab.h: master_parse.tab.c -+master_parse.tab.c: master_parse.y - $(YACC) -v -d -p master_ -b master_parse $? - - master_tok.o: master_tok.c master_parse.tab.h -@@ -57,5 +58,3 @@ clean: - install: all - install -d -m 755 $(INSTALLROOT)$(sbindir) - install -c automount -m 755 $(INSTALLROOT)$(sbindir) -- -- +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch new file mode 100644 index 0000000000..ab99a98cf9 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0006-Do-not-hardcode-path-for-pkg.m4.patch @@ -0,0 +1,31 @@ +From 349cc55c4cb7c7b2f5e7de937e11f3c581028b23 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 24 Aug 2018 06:24:36 +0000 +Subject: [PATCH] Do not hardcode path for pkg.m4 + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +update patch to version 5.1.6 +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 1bb1a52..4cebbd2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -12,7 +12,7 @@ define([AC_CACHE_SAVE], )dnl + AC_INIT(.autofs-5.1.9) + + # for pkg-config macros +-m4_include([/usr/share/aclocal/pkg.m4]) ++m4_include([pkg.m4]) + + # + # autofs installs by default in /usr +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch index e2a94bf825..14faa0c753 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/mount_conflict.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch @@ -1,4 +1,7 @@ -Avoid conflicts between sys/mount.h and linux/mount.h +From 96e0e3ed49a0e00573fa5907ae80e6d262cb7644 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 9 Sep 2024 23:01:06 +0800 +Subject: [PATCH] Avoid conflicts between sys/mount.h and linux/mount.h linux/fs.h includes linux/mount.h and this include file is unused so do not include it and avoid conflict too with glibc 2.36+ see [1] @@ -8,6 +11,13 @@ do not include it and avoid conflict too with glibc 2.36+ see [1] Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + modules/parse_amd.c | 1 - + modules/parse_sun.c | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/modules/parse_amd.c b/modules/parse_amd.c +index fb6b1b7..d86adf1 100644 --- a/modules/parse_amd.c +++ b/modules/parse_amd.c @@ -27,7 +27,6 @@ @@ -18,6 +28,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define MODULE_PARSE #include "automount.h" +diff --git a/modules/parse_sun.c b/modules/parse_sun.c +index a5351fd..8509781 100644 --- a/modules/parse_sun.c +++ b/modules/parse_sun.c @@ -30,7 +30,6 @@ @@ -28,3 +40,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define MODULE_PARSE #include "automount.h" +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch index 4c8b4ef779..13254f2c41 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0001-include-libgen.h-for-basename.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0008-include-libgen.h-for-basename.patch @@ -1,4 +1,4 @@ -From 1651e7a35be8b3e2fa90ca57b073f6944664fa62 Mon Sep 17 00:00:00 2001 +From c754222ce955c893e8e3ad75d8c73835950d1931 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 25 Mar 2024 12:04:03 -0700 Subject: [PATCH] include libgen.h for basename @@ -10,6 +10,7 @@ include libgen.h for providing it. [1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> --- daemon/automount.c | 1 + @@ -18,7 +19,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 3 files changed, 3 insertions(+) diff --git a/daemon/automount.c b/daemon/automount.c -index 3d9461d..61b3478 100644 +index 6cb3b1b..efc2680 100644 --- a/daemon/automount.c +++ b/daemon/automount.c @@ -21,6 +21,7 @@ @@ -30,7 +31,7 @@ index 3d9461d..61b3478 100644 #include <stdio.h> #include <stdlib.h> diff --git a/daemon/master.c b/daemon/master.c -index f99359c..3f56499 100644 +index f2c11e9..1455e40 100644 --- a/daemon/master.c +++ b/daemon/master.c @@ -21,6 +21,7 @@ @@ -42,7 +43,7 @@ index f99359c..3f56499 100644 #include <sys/types.h> #include <sys/stat.h> diff --git a/modules/lookup_file.c b/modules/lookup_file.c -index 6afc558..82b1f28 100644 +index 99f2e21..4914395 100644 --- a/modules/lookup_file.c +++ b/modules/lookup_file.c @@ -15,6 +15,7 @@ @@ -54,5 +55,5 @@ index 6afc558..82b1f28 100644 #include <string.h> #include <time.h> -- -2.44.0 +2.25.1 diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch new file mode 100644 index 0000000000..442a3138c2 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch @@ -0,0 +1,35 @@ +From 1a08bbed376c0dfa0ce2d12a93b34fb2d5620c05 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Tue, 10 Sep 2024 21:08:09 +0800 +Subject: [PATCH] hash.h: include <sys/reg.h> instead of <bits/reg.h> + +Fix build on musl: +In file included from ../include/automount.h:25, + from parse_subs.c:29: +../include/hash.h:27:2: error: #error Wordsize not 32 or 64 + 27 | #error Wordsize not 32 or 64 + | ^~~~~ + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + include/hash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/hash.h b/include/hash.h +index 0f1d7b5..f465ab8 100644 +--- a/include/hash.h ++++ b/include/hash.h +@@ -6,7 +6,7 @@ + #ifdef __GLIBC__ + #include <bits/wordsize.h> + #else +-#include <bits/reg.h> ++#include <sys/reg.h> + #endif + #include <linux/stddef.h> + #include <sys/types.h> +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch new file mode 100644 index 0000000000..0e15587340 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch @@ -0,0 +1,64 @@ +From a6a79230110e998f780796cb1d4c5d3f59f20d1d Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Mon, 18 Dec 2023 13:48:18 +0100 +Subject: [PATCH] autofs-5.1.9 - Fix incompatible function pointer types in + cyrus-sasl module + +Add casts to SASL callbacks to avoid incompatible-pointer-types +errors. Avoids a build failure with stricter compilers. + +Signed-off-by: Florian Weimer <fweimer@redhat.com> +Signed-off-by: Ian Kent <raven@themaw.net> + +Upstream-Status: Backport +[https://git.kernel.org/pub/scm/linux/storage/autofs/autofs.git/commit/?id=b7ff971bb8aa3fc609bb531ddc4c2ce56226383f] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CHANGELOG | 2 ++ + modules/cyrus-sasl.c | 14 +++++++------- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index 3e47daa..fd9d861 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,4 +1,6 @@ + ++- Fix incompatible function pointer types in cyrus-sasl module. ++ + 02/11/2023 autofs-5.1.9 + - fix kernel mount status notification. + - fix fedfs build flags. +diff --git a/modules/cyrus-sasl.c b/modules/cyrus-sasl.c +index e742eaf..78b7794 100644 +--- a/modules/cyrus-sasl.c ++++ b/modules/cyrus-sasl.c +@@ -109,17 +109,17 @@ static int getpass_func(sasl_conn_t *, void *, int, sasl_secret_t **); + static int getuser_func(void *, int, const char **, unsigned *); + + static sasl_callback_t callbacks[] = { +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + + static sasl_callback_t debug_callbacks[] = { +- { SASL_CB_LOG, &sasl_log_func, NULL }, +- { SASL_CB_USER, &getuser_func, NULL }, +- { SASL_CB_AUTHNAME, &getuser_func, NULL }, +- { SASL_CB_PASS, &getpass_func, NULL }, ++ { SASL_CB_LOG, (int(*)(void)) &sasl_log_func, NULL }, ++ { SASL_CB_USER, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_AUTHNAME, (int(*)(void)) &getuser_func, NULL }, ++ { SASL_CB_PASS, (int(*)(void)) &getpass_func, NULL }, + { SASL_CB_LIST_END, NULL, NULL }, + }; + +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch deleted file mode 100644 index 4cfd8edf9f..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/add-the-needed-stdarg.h.patch +++ /dev/null @@ -1,25 +0,0 @@ -From df5d45b2d7ad7e7b5f0542a816d08b0409a529a1 Mon Sep 17 00:00:00 2001 -From: Roy Li <rongqing.li@windriver.com> -Date: Tue, 19 Aug 2014 11:31:35 +0800 -Subject: [PATCH] [PATCH] add the needed stdarg.h - -Upstream-Status: Pending - -Signed-off-by: Roy Li <rongqing.li@windriver.com> - ---- - lib/defaults.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/defaults.c b/lib/defaults.c -index 0e48a78..667f35d 100644 ---- a/lib/defaults.c -+++ b/lib/defaults.c -@@ -16,6 +16,7 @@ - - #include <stdlib.h> - #include <stdio.h> -+#include <stdarg.h> - #include <ctype.h> - #include <string.h> - #include <sys/utsname.h> diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch deleted file mode 100644 index 8e06db6e4a..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/autofs-5.0.7-fix-lib-deps.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 080626108c9ab70e2489752ef2a14006d0564b0c Mon Sep 17 00:00:00 2001 -From: Joe MacDonald <joe.macdonald@windriver.com> -Date: Tue, 18 Jun 2013 10:05:21 -0400 -Subject: [PATCH] Fix the dependency issue - -Upstream-Status: Pending - -autofs's lib sources have a dependency on a number of files that are -generated by rpcgen during buildtime - -Signed-off-by: Roy.Li <rongqing.li@windriver.com> -Signed-off-by: Joe MacDonald <joe.macdonald@windriver.com> - ---- - lib/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lib/Makefile b/lib/Makefile -index 518b483..4798a4b 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -81,3 +81,4 @@ install: all - clean: - rm -f $(LIB) $(RPCS) $(OBJS) $(YACCSRC) *.output *~ - -+$(OBJS): $(RPCS) diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch deleted file mode 100644 index 2a4f4fd0dd..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/cross.patch +++ /dev/null @@ -1,55 +0,0 @@ -From b9b44cd82caceeb638cc6a862b5bb90b93ad6c6a Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 5 Jan 2013 19:53:10 -0800 - ---- -Upstream-Status: Pending - - aclocal.m4 | 2 ++ - configure.in | 8 ++++++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 2115204..2a9a802 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -7,6 +7,8 @@ dnl -------------------------------------------------------------------------- - AC_DEFUN(AF_PATH_INCLUDE, - [AC_PATH_PROGS($1,$2,$3,$4) - if test -n "$$1"; then -+ AH_TEMPLATE([HAVE_$1], [Have $2]) -+ AH_TEMPLATE([PATH_$1], [Have $2]) - AC_DEFINE(HAVE_$1,1,[define if you have $1]) - AC_DEFINE_UNQUOTED(PATH_$1, "$$1", [define if you have $1]) - HAVE_$1=1 -diff --git a/configure.in b/configure.in -index 25d7c4e..44a1c8b 100644 ---- a/configure.in -+++ b/configure.in -@@ -324,13 +324,15 @@ AC_PROG_CC - cat > pietest.c <<EOF - int main(void) { return 0; } - EOF -+AF_tmp_ldflags="$LDFLAGS" -+AF_tmp_cflags="$CFLAGS" - CFLAGS=-fPIE - LDFLAGS=-pie - DAEMON_CFLAGS= - DAEMON_LDFLAGS= - AC_MSG_CHECKING([whether gcc -fPIE works]) --AC_RUN_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], -- [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) -+AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[int main(void) {return 0;}]])], -+ [gcc_supports_pie=yes], [gcc_supports_pie=no], [gcc_supports_pie=no]) - AC_MSG_RESULT([$gcc_supports_pie]) - if test $gcc_supports_pie = yes ; then - DAEMON_CFLAGS="-fPIE" -@@ -339,6 +341,8 @@ fi - rm -f pietest.c - AC_SUBST(DAEMON_CFLAGS) - AC_SUBST(DAEMON_LDFLAGS) -+CFLAGS="${AF_tmp_cflags}" -+LDFLAGS="${AF_tmp_ldflags}" - - # - # Enable ability to access value in external env variable diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch deleted file mode 100644 index 414325974d..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/fix_disable_ldap.patch +++ /dev/null @@ -1,47 +0,0 @@ -From c500d9906f163bf716c872d37403b9de02ef0a86 Mon Sep 17 00:00:00 2001 -From: Amy Fong <amy.fong@windriver.com> -Date: Fri, 18 Jan 2013 12:13:32 -0500 -Subject: [PATCH] autofs: fails to compile with openldap disabled - -As of 5.0.6, it appears that changes were introduced so that -if you compile with openldap disabled and openldap headers are not -available, then autofs fails to build. - -Upstream-Status: Pending - -Signed-off-by: Amy Fong <amy.fong@windriver.com> --- - lookup_ldap.h | 4 ++++ - 1 file changed, 4 insertions(+) - ---- - include/lookup_ldap.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/include/lookup_ldap.h b/include/lookup_ldap.h -index 3a7aba7..bfdb0b3 100644 ---- a/include/lookup_ldap.h -+++ b/include/lookup_ldap.h -@@ -1,7 +1,9 @@ - #ifndef LOOKUP_LDAP_H - #define LOOKUP_LDAP_H - -+#ifdef WITH_LDAP - #include <ldap.h> -+#endif - - #ifdef WITH_SASL - #include <openssl/ssl.h> -@@ -117,10 +119,12 @@ struct lookup_context { - - #define LDAP_AUTH_USESIMPLE 0x0008 - -+#ifdef WITH_LDAP - /* lookup_ldap.c */ - LDAP *init_ldap_connection(unsigned logopt, const char *uri, struct lookup_context *ctxt); - int unbind_ldap_connection(unsigned logopt, struct ldap_conn *conn, struct lookup_context *ctxt); - int authtype_requires_creds(const char *authtype); -+#endif - - #ifdef WITH_SASL - /* cyrus-sasl.c */ diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch deleted file mode 100644 index be750ab897..0000000000 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs/pkgconfig-libnsl.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 602f9ca83c2bdbf511bcb178fcb4b9fc54da955f Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Tue, 27 Nov 2018 15:20:46 +0800 -Subject: [PATCH] From e3ae56cf0bb4063c31295f45d04e3c504f4b6cc7 Mon Sep 17 - 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 24 Apr 2017 - 20:41:25 -0700 Subject: [PATCH] autofs: Upgrade to 5.1.2 release - -Use pkg-config first to look for external libnsl which is now -split out from glibc, if it does not exist then see if its provided -by glibc itself. - --Khem - -Upstream-Status: Pending - -update patch to version 5.1.5 -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 76ecb40..493b9f1 100644 ---- a/configure.in -+++ b/configure.in -@@ -238,7 +238,7 @@ AC_SUBST(LIBCLOCK_GETTIME) - - PKG_CHECK_MODULES([NSL],[libnsl],, - [ --AC_CHECK_LIB(nsl, yp_match, NSL_LIBS="-lnsl") -+PKG_CHECK_MODULES([NSL], [libnsl], [], [AC_CHECK_LIB([nsl],[yp_match],[LIBNSL="-lnsl"],[LIBNSL=""])]) - AC_SUBST(NSL_LIBS) - NSL_CFLAGS="" - ]) --- -2.7.4 - diff --git a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb index e3f9777380..bc52f40d1c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/autofs/autofs_5.1.9.bb @@ -3,55 +3,44 @@ SECTION = "utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ee9324a6f564bb2376b63878ac396798" -DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl libxml2 util-linux cyrus-sasl libnsl2" +DEPENDS += "libtirpc flex-native bison-native e2fsprogs openssl util-linux libnsl2" CFLAGS += "-I${STAGING_INCDIR}/tirpc" inherit autotools-brokensep systemd update-rc.d pkgconfig SRC_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/autofs-${PV}.tar.gz \ - file://no-bash.patch \ - file://cross.patch \ - file://fix_disable_ldap.patch \ - file://autofs-5.0.7-fix-lib-deps.patch \ - file://add-the-needed-stdarg.h.patch \ - file://using-pkg-config-to-detect-libxml-2.0-and-krb5.patch \ - file://force-STRIP-to-emtpy.patch \ - file://remove-bashism.patch \ - file://fix-the-YACC-rule-to-fix-a-building-failure.patch \ - file://0001-Define-__SWORD_TYPE-and-_PATH_NSSWITCH_CONF.patch \ - file://0002-Replace-__S_IEXEC-with-S_IEXEC.patch \ - file://pkgconfig-libnsl.patch \ - file://0001-modules-lookup_multi.c-Replace-__S_IEXEC-with-S_IEXE.patch \ - file://0001-Do-not-hardcode-path-for-pkg.m4.patch \ - file://0001-Bug-fix-for-pid_t-not-found-on-musl.patch \ - file://0001-Define-__SWORD_TYPE-if-undefined.patch \ - file://mount_conflict.patch \ - file://0001-autofs-5.1.8-add-autofs_strerror_r-helper-for-musl.patch \ - file://0002-autofs-5.1.8-handle-innetgr-not-present-in-musl.patch \ - file://0001-include-libgen.h-for-basename.patch \ + file://0001-no-bash.patch \ + file://0002-using-pkg-config-to-detect-krb5.patch \ + file://0003-force-STRIP-to-emtpy.patch \ + file://0004-autofs.init.in-remove-bashism.patch \ + file://0005-fix-the-YACC-rule-to-fix-a-building-failure.patch \ + file://0006-Do-not-hardcode-path-for-pkg.m4.patch \ + file://0007-Avoid-conflicts-between-sys-mount.h-and-linux-mount..patch \ + file://0008-include-libgen.h-for-basename.patch \ + file://0009-hash.h-include-sys-reg.h-instead-of-bits-reg.h.patch \ + file://0010-autofs-5.1.9-Fix-incompatible-function-pointer-types.patch \ " -SRC_URI[sha256sum] = "0bd401c56f0eb1ca6251344c3a3d70bface3eccf9c67117cd184422c4cace30c" +SRC_URI[sha256sum] = "46c30b763ef896f4c4a6df6d62aaaef7afc410e0b7f50d52dbfc6cf728cacd4f" UPSTREAM_CHECK_URI = "${KERNELORG_MIRROR}/linux/daemons/autofs/v5/" INITSCRIPT_NAME = "autofs" INITSCRIPT_PARAMS = "defaults" -# FIXME: modules/Makefile has crappy rules that don't obey LDFLAGS -#CFLAGS += "${LDFLAGS}" - PACKAGECONFIG[systemd] = "--with-systemd=${systemd_unitdir}/system,--without-systemd,systemd" +PACKAGECONFIG[openldap] = "--with-openldap=yes,--with-openldap=no,libxml2 openldap" +PACKAGECONFIG[sasl] = "--with-sasl=yes,--with-sasl=no,cyrus-sasl krb5" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" EXTRA_OEMAKE = "DONTSTRIP=1" EXTRA_OECONF += "--disable-mount-locking \ - --enable-ignore-busy --with-openldap=no \ + --enable-ignore-busy \ --with-confdir=${sysconfdir}/default \ --with-fifodir=/run \ --with-flagdir=/run \ - --with-sasl=no --with-libtirpc \ + --with-libtirpc \ --with-mapdir=${sysconfdir} \ --with-path=${STAGING_BINDIR_NATIVE} \ --with-fifodir=${localstatedir}/run \ diff --git a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb index 7947ffe457..90e7814a0f 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ippool/ippool_1.3.bb @@ -42,7 +42,7 @@ inherit systemd DEPENDS = "readline ppp ncurses gzip-native rpcsvc-proto-native libtirpc" RDEPENDS:${PN} = "rpcbind" -EXTRA_OEMAKE = "CC='${CC}' AS='${AS}' LD='${LD}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" +EXTRA_OEMAKE = "CC='${CC} ${CFLAGS}' AS='${AS}' LD='${LD} ${LDFLAGS}' AR='${AR}' NM='${NM}' STRIP='${STRIP}'" EXTRA_OEMAKE += "PPPD_VERSION=${PPPD_VERSION} SYS_LIBDIR=${libdir}" # enable self tests EXTRA_OEMAKE += "IPPOOL_TEST=y" @@ -52,12 +52,7 @@ CPPFLAGS += "${SELECTED_OPTIMIZATION} -I${STAGING_INCDIR}/tirpc" SYSTEMD_SERVICE:${PN} = "ippool.service" do_compile:prepend() { - # fix the CFLAGS= and CPPFLAGS= in main Makefile, to have the extra CFLAGS in env - sed -i -e "s/^CFLAGS=/CFLAGS+=/" ${S}/Makefile - sed -i -e "s/^CPPFLAGS=/CPPFLAGS+=/" ${S}/Makefile - sed -i -e "s:-I/usr/include/pppd:-I=/usr/include/pppd:" ${S}/pppd/Makefile - } diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch new file mode 100644 index 0000000000..1f9f8b30b1 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived/0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch @@ -0,0 +1,29 @@ +From 5b1b04356f3efc08ae279cafc6ee86df11f10c9a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 15 Aug 2024 23:13:02 -0700 +Subject: [PATCH] configure.ac: Do not emit compiler flags into object files + +They contain options which have absolute paths in them e.g. --sysroot +therefore do not record them and make build reproducible + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index fae16f1..677b94a 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -904,8 +904,7 @@ if test "$enable_hardening" != no; then + "-Wp,-D_FORTIFY_SOURCE=2" \ + "-fexceptions" \ + "-fstack-protector-strong" \ +- "--param=ssp-buffer-size=4" \ +- "-grecord-gcc-switches" ++ "--param=ssp-buffer-size=4" + do + AC_MSG_CHECKING([for $FLAG support]) + CFLAGS="$CFLAGS $FLAG" diff --git a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb index 85f4a6aa59..c4d59d3caa 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/keepalived/keepalived_2.2.8.bb @@ -11,6 +11,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "http://www.keepalived.org/software/${BP}.tar.gz \ + file://0001-configure.ac-Do-not-emit-compiler-flags-into-object-.patch \ " SRC_URI[sha256sum] = "85882eb62974f395d4c631be990a41a839594a7e62fbfebcb5649a937a7a1bb6" UPSTREAM_CHECK_URI = "https://github.com/acassen/keepalived/releases" @@ -30,6 +31,10 @@ EXTRA_OEMAKE = "initdir=${sysconfdir}/init.d" export EXTRA_CFLAGS = "${CFLAGS}" +do_configure:append() { + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/lib/config.h +} + do_install:append() { if [ -f ${D}${sysconfdir}/init.d/${BPN} ]; then chmod 0755 ${D}${sysconfdir}/init.d/${BPN} diff --git a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb index 15bb00a3af..de111cac05 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/ncftp/ncftp_3.2.7.bb @@ -28,3 +28,7 @@ do_install () { 'SYSCONFDIR=${D}${sysconfdir}' 'mandir=${D}${mandir}' \ install } + +# http://errors.yoctoproject.org/Errors/Details/766888/ +# ncftp/3.2.7/ncftp-3.2.7/config.h:358:28: error: passing argument 2 of 'select' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb index aa8d5fabd6..33480bff2c 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.7c.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/proftpd/proftpd_1.3.8b.bb @@ -4,8 +4,8 @@ HOMEPAGE = "http://www.proftpd.org" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184" -SRCREV = "75aa739805a6e05eeb31189934a3d324e7862962" -BRANCH = "1.3.7" +SRCREV = "0a7ea9b0ba9fcdf368374a226370d08f10397d99" +BRANCH = "1.3.8" SRC_URI = "git://github.com/proftpd/proftpd.git;branch=${BRANCH};protocol=https \ file://basic.conf.patch \ @@ -21,7 +21,7 @@ S = "${WORKDIR}/git" inherit autotools-brokensep useradd update-rc.d systemd multilib_script -EXTRA_OECONF += "--enable-largefile" +EXTRA_OECONF += "--enable-largefile INSTALL=install" PACKAGECONFIG ??= "shadow \ ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6 pam', d)} \ @@ -70,6 +70,12 @@ do_configure () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S} install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.sub ${S} oe_runconf + sed -e 's|--sysroot=${STAGING_DIR_HOST}||g' \ + -e 's|${STAGING_DIR_NATIVE}||g' \ + -e 's|-ffile-prefix-map=[^ ]*||g' \ + -e 's|-fdebug-prefix-map=[^ ]*||g' \ + -e 's|-fmacro-prefix-map=[^ ]*||g' \ + -i ${B}/config.h } FTPUSER = "ftp" @@ -116,7 +122,7 @@ do_install () { -e 's|-ffile-prefix-map=[^ ]*||g' \ -e 's|-fdebug-prefix-map=[^ ]*||g' \ -e 's|-fmacro-prefix-map=[^ ]*||g' \ - -i ${D}/${bindir}/prxs + -i ${D}/${bindir}/prxs ${D}${includedir}/proftpd/Make.rules ${D}${includedir}/proftpd/config.h # ftpmail perl script, which reads the proftpd log file and sends # automatic email notifications once an upload finishs, diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch index e0d002c68c..489850e3bd 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/files/Skip-AC_RUN_IFELSE-tests.patch @@ -37,7 +37,7 @@ Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ]) --- a/acinclude/lib-checks.m4 +++ b/acinclude/lib-checks.m4 -@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_ +@@ -205,7 +205,9 @@ AC_DEFUN([SQUID_CHECK_OPENSSL_CONST_SSL_METHOD],[ [ AC_MSG_RESULT([no]) ], diff --git a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.9.bb b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.10.bb index f670a776eb..984209ad21 100644 --- a/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.9.bb +++ b/meta-openembedded/meta-networking/recipes-daemons/squid/squid_6.10.bb @@ -22,7 +22,7 @@ SRC_URI = "http://www.squid-cache.org/Versions/v${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://squid.nm \ " -SRC_URI[sha256sum] = "1ad72d46e1cb556e9561214f0fb181adb87c7c47927ef69bc8acd68a03f61882" +SRC_URI[sha256sum] = "0b07b187e723f04770dd25beb89aec12030a158696aa8892d87c8b26853408a7" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://errors/COPYRIGHT;md5=d324bc1f9447d1d1588d75b22a678dc4 \ diff --git a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb index ee006efe28..93d293493c 100644 --- a/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb +++ b/meta-openembedded/meta-networking/recipes-extended/dlm/dlm_4.2.0.bb @@ -37,6 +37,7 @@ SYSTEMD_AUTO_ENABLE = "enable" export EXTRA_OEMAKE = "" CFPROTECTION ?= "-fcf-protection=full" +CFPROTECTION:riscv32 = "" CFPROTECTION:riscv64 = "" CFPROTECTION:arm = "" CFPROTECTION:aarch64 = "" diff --git a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.21.bb b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.22.bb index c7ebdc1c66..5eaf142411 100644 --- a/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.21.bb +++ b/meta-openembedded/meta-networking/recipes-filter/ipset/ipset_7.22.bb @@ -11,7 +11,7 @@ DEPENDS = "libtool libmnl" SRC_URI = "http://ftp.netfilter.org/pub/ipset/${BP}.tar.bz2 \ file://0001-ipset-Define-portable-basename-function.patch" -SRC_URI[sha256sum] = "e2c6ce4fcf3acb3893ca5d35c86935f80ad76fc5ccae601185842df760e0bc69" +SRC_URI[sha256sum] = "f6ac5a47c3ef9f4c67fcbdf55e791cbfe38eb0a4aa1baacd12646a140abacdd9" inherit autotools pkgconfig module-base diff --git a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb index 841a7267b8..b465209389 100644 --- a/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.6.bb +++ b/meta-openembedded/meta-networking/recipes-filter/libnftnl/libnftnl_1.2.7.bb @@ -7,7 +7,7 @@ SRC_URI = "git://git.netfilter.org/libnftnl;branch=master \ file://0001-configure.ac-Add-serial-tests.patch \ file://run-ptest \ " -SRCREV = "83dd4dc316b4189d16ead54cd30bfc89e5160cfd" +SRCREV = "116e95aa7b6358c917de8c69f6f173874030b46b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch deleted file mode 100644 index 164182bb1e..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7a6089a400a573b9a4fd92f29c00a6be7b8ef269 Mon Sep 17 00:00:00 2001 -From: Phil Sutter <phil@nwl.cc> -Date: Thu, 2 Nov 2023 16:02:14 +0100 -Subject: [PATCH] tests: shell: Fix sets/reset_command_0 for current kernels - -Since kernel commit 4c90bba60c26 ("netfilter: nf_tables: do not refresh -timeout when resetting element"), element reset won't touch expiry -anymore. Invert the one check to make sure it remains unaltered, drop -the other testing behaviour for per-element timeouts. - -Signed-off-by: Phil Sutter <phil@nwl.cc> - -Upstream-Status: Backport -[https://git.netfilter.org/nftables/commit/?id=7a6089a400a573b9a4fd92f29c00a6be7b8ef269] - -Signed-off-by: William Lyu <William.Lyu@windriver.com> ---- - tests/shell/testcases/sets/reset_command_0 | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/tests/shell/testcases/sets/reset_command_0 b/tests/shell/testcases/sets/reset_command_0 -index e663dac8..d38ddb3f 100755 ---- a/tests/shell/testcases/sets/reset_command_0 -+++ b/tests/shell/testcases/sets/reset_command_0 -@@ -44,10 +44,10 @@ elem='element t s { 1.0.0.1 . udp . 53 }' - grep 'elements = ' | drop_seconds | uniq | wc -l) == 1 ]] - echo OK - --echo -n "counters and expiry are reset: " -+echo -n "counters are reset, expiry left alone: " - NEW=$($NFT "get $elem") - grep -q 'counter packets 0 bytes 0' <<< "$NEW" --[[ $(expires_minutes <<< "$NEW") -gt 20 ]] -+[[ $(expires_minutes <<< "$NEW") -lt 20 ]] - echo OK - - echo -n "get map elem matches reset map elem: " -@@ -80,12 +80,6 @@ OUT=$($NFT reset map t m) - $DIFF -u <(echo "$EXP") <(echo "$OUT") - echo OK - --echo -n "reset command respects per-element timeout: " --VAL=$($NFT get element t s '{ 2.0.0.2 . tcp . 22 }' | expires_minutes) --[[ $VAL -lt 15 ]] # custom timeout applies --[[ $VAL -gt 10 ]] # expires was reset --echo OK -- - echo -n "remaining elements are reset: " - OUT=$($NFT list ruleset) - grep -q '2.0.0.2 . tcp . 22 counter packets 0 bytes 0' <<< "$OUT" --- -2.43.0 - diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch deleted file mode 100644 index 2a966ab443..0000000000 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch +++ /dev/null @@ -1,46 +0,0 @@ -From fff913c1eefbc84eb2d9c52038ef29fe881e9ee9 Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Tue, 21 Nov 2023 21:16:38 +0100 -Subject: [PATCH] tests: shell: skip secmark tests if kernel does not support - it - -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> - -Upstream-Status: Backport -[https://git.netfilter.org/nftables/commit/?id=fff913c1eefbc84eb2d9c52038ef29fe881e9ee9] - -Signed-off-by: William Lyu <William.Lyu@windriver.com> ---- - tests/shell/features/secmark.nft | 7 +++++++ - tests/shell/testcases/json/0005secmark_objref_0 | 1 + - 2 files changed, 8 insertions(+) - create mode 100644 tests/shell/features/secmark.nft - -diff --git a/tests/shell/features/secmark.nft b/tests/shell/features/secmark.nft -new file mode 100644 -index 00000000..ccbb572f ---- /dev/null -+++ b/tests/shell/features/secmark.nft -@@ -0,0 +1,7 @@ -+# fb961945457f ("netfilter: nf_tables: add SECMARK support") -+# v4.20-rc1~14^2~125^2~5 -+table inet x { -+ secmark ssh_server { -+ "system_u:object_r:ssh_server_packet_t:s0" -+ } -+} -diff --git a/tests/shell/testcases/json/0005secmark_objref_0 b/tests/shell/testcases/json/0005secmark_objref_0 -index 992d1b00..5c44f093 100755 ---- a/tests/shell/testcases/json/0005secmark_objref_0 -+++ b/tests/shell/testcases/json/0005secmark_objref_0 -@@ -1,6 +1,7 @@ - #!/bin/bash - - # NFT_TEST_REQUIRES(NFT_TEST_HAVE_json) -+# NFT_TEST_REQUIRES(NFT_TEST_HAVE_secmark) - - set -e - --- -2.43.0 - diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest index 32ddf9f455..55e801f67c 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables/run-ptest @@ -5,14 +5,18 @@ cd ${NFTABLESLIB}/ptest || exit 1 LOG="${NFTABLESLIB}/ptest/nftables_ptest_$(date +%Y%m%d-%H%M%S).log" NFT=nft -tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" +tests/shell/run-tests.sh -v | sed -E '/I: \[OK\]/ s/^/PASS: / ; /W: \[(CHK DUMP|VALGRIND|TAINTED|DUMP FAIL|FAILED)\]/ s/^/FAIL: / ; /I: \[SKIPPED\]/ s/^/SKIP: /' | sed "s,\x1B\[[0-9;]*[a-zA-Z],,g" | tee -a "${LOG}" passed=$(grep -c PASS: "${LOG}") failed=$(grep -c FAIL: "${LOG}") -all=$((passed + failed)) +skiped=$(grep -c SKIP: "${LOG}") + +all=$((passed + failed + skiped)) ( echo "=== Test Summary ===" echo "TOTAL: ${all}" echo "PASSED: ${passed}" echo "FAILED: ${failed}" + echo "SKIPED: ${skiped}" + echo "====================" ) | tee -a "${LOG}" diff --git a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb index 17f00ffd42..98e7a85a47 100644 --- a/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.0.9.bb +++ b/meta-openembedded/meta-networking/recipes-filter/nftables/nftables_1.1.0.bb @@ -12,11 +12,9 @@ DEPENDS = "libmnl libnftnl bison-native \ ${@bb.utils.contains('PACKAGECONFIG', 'mini-gmp', '', 'gmp', d)}" SRC_URI = "http://www.netfilter.org/projects/nftables/files/${BP}.tar.xz \ - file://0001-tests-shell-Fix-sets-reset_command_0-for-current-ker.patch \ - file://0001-tests-shell-skip-secmark-tests-if-kernel-does-not-su.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "a3c304cd9ba061239ee0474f9afb938a9bb99d89b960246f66f0c3a0a85e14cd" +SRC_URI[sha256sum] = "ef3373294886c5b607ee7be82c56a25bc04e75f802f8e8adcd55aac91eb0aa24" inherit autotools manpages pkgconfig ptest @@ -26,16 +24,16 @@ PACKAGECONFIG[json] = "--with-json, --without-json, jansson" PACKAGECONFIG[linenoise] = "--with-cli=linenoise, , linenoise, , , editline readline" PACKAGECONFIG[manpages] = "--enable-man-doc, --disable-man-doc, asciidoc-native" PACKAGECONFIG[mini-gmp] = "--with-mini-gmp, --without-mini-gmp" -PACKAGECONFIG[python] = ",, python3-setuptools-native" +PACKAGECONFIG[python] = "" PACKAGECONFIG[readline] = "--with-cli=readline, , readline, , , editline linenoise" PACKAGECONFIG[xtables] = "--with-xtables, --without-xtables, iptables" EXTRA_OECONF = " \ ${@bb.utils.contains_any('PACKAGECONFIG', 'editline linenoise readline', '', '--without-cli', d)}" -SETUPTOOLS_SETUP_PATH = "${S}/py" +PEP517_SOURCE_PATH = "${S}/py" -inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'setuptools3', '', d)} +inherit_defer ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python_setuptools_build_meta', '', d)} PACKAGES =+ "${@bb.utils.contains('PACKAGECONFIG', 'python', '${PN}-python', '', d)}" FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}" @@ -46,21 +44,21 @@ RDEPENDS:${PN}-python = "python3-core python3-json ${PN}" do_configure() { autotools_do_configure if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_configure + python_pep517_do_configure fi } do_compile() { autotools_do_compile if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_compile + python_pep517_do_compile fi } do_install() { autotools_do_install if ${@bb.utils.contains('PACKAGECONFIG', 'python', 'true', 'false', d)}; then - setuptools3_do_install + python_pep517_do_install fi } diff --git a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb index 1517384eca..68dd0702f7 100644 --- a/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb +++ b/meta-openembedded/meta-networking/recipes-irc/znc/znc_1.8.2.bb @@ -29,4 +29,5 @@ do_configure:prepend() { do_install:append() { sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${libdir}/pkgconfig/*.pc + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/znc-buildmod } diff --git a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb index 8def54ece6..c12b8abd5d 100644 --- a/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb +++ b/meta-openembedded/meta-networking/recipes-kernel/wireguard/wireguard-tools_1.0.20210914.bb @@ -1,7 +1,7 @@ require wireguard.inc SRCREV = "3ba6527130c502144e7388b900138bca6260f4e8" -SRC_URI = "git://git.zx2c4.com/wireguard-tools;branch=master" +SRC_URI = "git://github.com/WireGuard/wireguard-tools.git;branch=master;protocol=https" inherit bash-completion systemd pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch new file mode 100644 index 0000000000..98ba4d5283 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/files/0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch @@ -0,0 +1,39 @@ +From fa6227d92725af5ae17b8435c0d50d92ff7a575c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 19:32:25 -0700 +Subject: [PATCH] bison/flex: Add flags for carrying user specified parameters + +This helps in passing cmdline to flex and bison e.g. to remove lines +from generated output to avoid absolute paths + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + cmake/Modules/CMakeUserUseBison.cmake | 1 + + cmake/Modules/CMakeUserUseFlex.cmake | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/cmake/Modules/CMakeUserUseBison.cmake b/cmake/Modules/CMakeUserUseBison.cmake +index 9257545..b61bd0e 100644 +--- a/cmake/Modules/CMakeUserUseBison.cmake ++++ b/cmake/Modules/CMakeUserUseBison.cmake +@@ -52,6 +52,7 @@ IF(BISON_EXECUTABLE) + OUTPUT "${OUTFILE}" "${HEADER}" + COMMAND "${BISON_EXECUTABLE}" + ARGS "--name-prefix=${PREFIX}" ++ "${BISON_TARGET_ARG_COMPILE_FLAGS}" + "--defines" + "--output-file=${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" +diff --git a/cmake/Modules/CMakeUserUseFlex.cmake b/cmake/Modules/CMakeUserUseFlex.cmake +index 7d0394f..1221dca 100644 +--- a/cmake/Modules/CMakeUserUseFlex.cmake ++++ b/cmake/Modules/CMakeUserUseFlex.cmake +@@ -39,6 +39,7 @@ IF(FLEX_EXECUTABLE) + OUTPUT "${OUTFILE}" + COMMAND "${FLEX_EXECUTABLE}" + ARGS "-P${PREFIX}" ++ "${FLEX_TARGET_ARG_COMPILE_FLAGS}" + "-o${OUTFILE}" + "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}" + DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${FILENAME}") diff --git a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb index c7c329a5d4..cf50a92afb 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/freediameter/freediameter_1.5.0.bb @@ -7,7 +7,7 @@ Accounting needs." HOMEPAGE = "http://www.freediameter.net" -DEPENDS = "flex bison cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" +DEPENDS = "flex-native bison-native cmake-native libgcrypt gnutls libidn2 lksctp-tools virtual/kernel bison-native" PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -23,6 +23,7 @@ SRC_URI = "git://github.com/freeDiameter/freeDiameter;protocol=https;branch=mast file://freeDiameter.conf \ file://install_test.patch \ file://0001-tests-use-EXTENSIONS_DIR.patch \ + file://0001-bison-flex-Add-flags-for-carrying-user-specified-par.patch \ " S = "${WORKDIR}/git" @@ -49,6 +50,8 @@ EXTRA_OECMAKE = " \ -DEXTENSIONS_DIR:PATH=${libdir}/${fd_pkgname} \ -DINSTALL_TEST_SUFFIX:PATH=${PTEST_PATH}-tests \ -DCMAKE_SKIP_RPATH:BOOL=ON \ + -DFLEX_TARGET_ARG_COMPILE_FLAGS='--noline' \ + -DBISON_TARGET_ARG_COMPILE_FLAGS='--no-lines' \ " # INSTALL_LIBRARY_SUFFIX is relative to CMAKE_INSTALL_PREFIX # specify it on cmd line will fix the SET bug in CMakeList.txt @@ -107,15 +110,13 @@ EOF # create self cert openssl req -x509 -config ${STAGING_DIR_NATIVE}/etc/ssl/openssl.cnf -newkey rsa:4096 -sha256 -nodes -out ${D}${sysconfdir}/freeDiameter/${FD_PEM} -keyout ${D}${sysconfdir}/freeDiameter/${FD_KEY} -days 3650 -subj '/CN=${FD_HOSTNAME}.${FD_REALM}' openssl dhparam -out ${D}${sysconfdir}/freeDiameter/${FD_DH_PEM} 1024 - - find ${B} \( -name "*.c" -o -name "*.h" \) -exec sed -i -e 's#${UNPACKDIR}##g' {} \; } do_install_ptest() { mv ${D}${PTEST_PATH}-tests/* ${D}${PTEST_PATH}/ rmdir ${D}${PTEST_PATH}-tests install -m 0644 ${B}/tests/CTestTestfile.cmake ${D}${PTEST_PATH}/ - sed -i -e 's#${UNPACKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i -e 's#${WORKDIR}##g' ${D}${PTEST_PATH}/CTestTestfile.cmake sed -i "/^set_tests_properties/d" ${D}${PTEST_PATH}/CTestTestfile.cmake } diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch b/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch deleted file mode 100644 index 8c83d5c8eb..0000000000 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr/0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 49aeccbec4bf620bb594999bbd4a9de669a3984c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 15 Mar 2024 14:34:06 -0700 -Subject: [PATCH] zebra: Mimic GNU basename() API for non-glibc library e.g. - musl musl only provides POSIX version of basename and it has also removed - providing it via string.h header [1] which now results in compile errors with - newer compilers e.g. clang-18 - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://github.com/FRRouting/frr/pull/15561/] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - zebra/zebra_netns_notify.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/zebra/zebra_netns_notify.c b/zebra/zebra_netns_notify.c -index 1bb1292e34..d55df2f62d 100644 ---- a/zebra/zebra_netns_notify.c -+++ b/zebra/zebra_netns_notify.c -@@ -41,6 +41,10 @@ - #define ZEBRA_NS_POLLING_INTERVAL_MSEC 1000 - #define ZEBRA_NS_POLLING_MAX_RETRIES 200 - -+#if !defined(__GLIBC__) -+#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) -+#endif -+ - DEFINE_MTYPE_STATIC(ZEBRA, NETNS_MISC, "ZebraNetNSInfo"); - static struct event *zebra_netns_notify_current; - --- -2.44.0 - diff --git a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb index afd2c95a0e..237b52592b 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.0.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/frr/frr_10.1.1.bb @@ -10,12 +10,11 @@ LIC_FILES_CHKSUM = "file://doc/licenses/GPL-2.0;md5=b234ee4d69f5fce4486a80fdaf4a file://doc/licenses/LGPL-2.1;md5=4fbd65380cdd255951079008b364516c" -SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.0 \ +SRC_URI = "git://github.com/FRRouting/frr.git;protocol=https;branch=stable/10.1 \ file://frr.pam \ - file://0001-zebra-Mimic-GNU-basename-API-for-non-glibc-library-e.patch \ " -SRCREV = "03a143cd49ed1b190cb38f48a31ef4d71fa01a02" +SRCREV = "dbf8dac1cea2b1235746e2d966a8ded9cffd5dc3" UPSTREAM_CHECK_GITTAGREGEX = "frr-(?P<pver>\d+(\.\d+)+)$" diff --git a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb index 9aeda92a4b..e6ea707197 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.120.24.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/mdns/mdns_2200.140.11.bb @@ -25,7 +25,7 @@ SRC_URI = "git://github.com/apple-oss-distributions/mDNSResponder;protocol=https file://0001-Handle-interface-without-ifa_addr.patch \ file://0001-Fix-SIGSEGV-during-DumpStateLog.patch \ " -SRCREV = "51a7148a21362285f8013648c4bfa91247ff598a" +SRCREV = "12e84b9089e577e0c0a9f48c4b922d7349fcc5a4" # We install a stub Makefile in the top directory so that the various checks # in base.bbclass pass their tests for a Makefile, this ensures (that amongst diff --git a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb index 75b3d9e8c6..989ec54132 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/net-snmp/net-snmp_5.9.4.bb @@ -73,6 +73,7 @@ CACHED_CONFIGUREVARS = " \ lt_cv_shlibpath_overrides_runpath=yes \ ac_cv_path_UNAMEPROG=${base_bindir}/uname \ ac_cv_path_PSPROG=${base_bindir}/ps \ + ac_cv_ps_flags="-e" \ ac_cv_file__etc_printcap=no \ NETSNMP_CONFIGURE_OPTIONS= \ " diff --git a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb index aad044a043..0061565f90 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/openflow/openflow_git.bb @@ -67,3 +67,8 @@ do_install:append() { } FILES:${PN} += "${nonarch_libdir}/tmpfiles.d" + +# http://errors.yoctoproject.org/Errors/Details/766898/ +# lib/flow.c:213:48: error: initialization of 'const struct arp_eth_header *' from incompatible pointer type 'struct arp_header *' [-Wincompatible-pointer-types] +# lib/backtrace.c:126:32: error: passing argument 1 of 'backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb index 4c18c6aff9..3769d5cab0 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/usrsctp/usrsctp_git.bb @@ -25,3 +25,4 @@ PACKAGECONFIG[inet6] = "--enable-inet6,--disable-inet6," EXTRA_OECONF += "--disable-debug" CVE_VERSION = "0.9.5.0" +CVE_STATUS[CVE-2019-20503] = "cpe-incorrect: The current version (0.9.5.0) is not affected by the CVE which affects versions at least earlier than 0.9.4.0" diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch new file mode 100644 index 0000000000..c69a395f10 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0001-Update-to-C-17-560.patch @@ -0,0 +1,969 @@ +From 7acb528db20c08d90f72fa317b8e1ccf4d270cdc Mon Sep 17 00:00:00 2001 +From: Matthew Russell <matthew.g.russell@gmail.com> +Date: Wed, 10 Apr 2024 06:23:27 -0400 +Subject: [PATCH 1/2] Update to C++17 (#560) + +* Upgrading to C++17 + +* Code Quality: Address compiler warnings + +- Fixing narrowing issues +- Removing useless copies +- Removing unused lines +- unused-lambda-capture +- Removes unused variables +- Fix some casts (modernize c-style, or simply remove useless casts) +- Explicitly deleting unused endpoint_impl copy and move constructors +- Removing redundant std::bind +- Improving const correctness +- Moving thread init to constructor body +- Moved check_routing_credentials_ inside vsomeip security section where it's used +- Using =default destructor instead of empty destructor + +Thread init: +Moving the initialization of these threads into the constructor body to +ensure that they do not start with an incomplete "this". As they +capture this, it is possible that if the new thread begins before the +object is fully constructed, the new thread might operate on +uninitialized members of "this". + +* Attempting to fix syntax error on MSVC + +* Adjusting PR to conform to Covesa style + +* Using curly brace initialization + +* Using static_cast to narrow its_device.size() to a socklen_t + +* Avoided double integer promotion + +Upstream-Status: Backport [https://github.com/COVESA/vsomeip/pull/560] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Android.bp | 2 +- + CMakeLists.txt | 11 ++- + examples/hello_world/hello_world_service.hpp | 12 +-- + .../configuration/include/internal.hpp.in | 6 +- + .../include/internal_android.hpp | 10 +-- + .../configuration/src/configuration_impl.cpp | 13 ++-- + .../endpoints/include/endpoint_impl.hpp | 3 + + .../local_server_endpoint_impl_receive_op.hpp | 4 +- + .../local_uds_client_endpoint_impl.hpp | 2 +- + .../local_uds_server_endpoint_impl.hpp | 2 +- + .../udp_server_endpoint_impl_receive_op.hpp | 2 +- + .../endpoints/src/endpoint_manager_base.cpp | 2 +- + .../src/local_uds_client_endpoint_impl.cpp | 5 -- + .../src/local_uds_server_endpoint_impl.cpp | 6 -- + .../src/tcp_client_endpoint_impl.cpp | 2 +- + .../src/tcp_server_endpoint_impl.cpp | 14 ++-- + .../src/udp_client_endpoint_impl.cpp | 2 +- + .../src/udp_server_endpoint_impl.cpp | 4 +- + .../message/include/message_base_impl.hpp | 2 - + implementation/message/src/deserializer.cpp | 4 +- + .../plugin/src/plugin_manager_impl.cpp | 2 +- + .../routing/src/routing_manager_base.cpp | 10 +-- + .../runtime/include/application_impl.hpp | 4 +- + .../runtime/src/application_impl.cpp | 7 +- + implementation/security/src/policy.cpp | 4 +- + implementation/security/src/security.cpp | 1 + + .../src/service_discovery_impl.cpp | 34 +++++---- + interface/vsomeip/constants.hpp | 74 +++++++++---------- + .../application_tests/application_test.cpp | 1 + + tools/vsomeip_ctrl.cpp | 9 ++- + 30 files changed, 129 insertions(+), 125 deletions(-) + +diff --git a/Android.bp b/Android.bp +index c6caa4de..f314f22b 100644 +--- a/Android.bp ++++ b/Android.bp +@@ -30,9 +30,9 @@ libvsomeip_sd_srcs = [ + + cc_defaults { + name: "vsomeip_defaults", ++ cpp_std: "c++17", + + cppflags: [ +- "-std=c++14", + "-fexceptions", + "-Wno-non-virtual-dtor", + "-Wno-unused-const-variable", +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ab399a69..3d947055 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -64,6 +64,8 @@ if(NOT CMAKE_BUILD_TYPE) + set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo") + endif() + ++set(CMAKE_CXX_STANDARD 17) ++ + # OS + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(DL_LIBRARY "dl") +@@ -248,13 +250,13 @@ if (MSVC) + # add_definitions(-DVSOMEIP_DLL_COMPILATION) now it is controlled per target + SET(BOOST_WINDOWS_VERSION "0x600" CACHE STRING "Set the same Version as the Version with which Boost was built, otherwise there will be errors. (normaly 0x600 is for Windows 7 and 0x501 is for Windows XP)") + # Disable warning C4250 since it warns that the compiler is correctly following the C++ Standard. It's a "We-Are-Doing-Things-By-The-Book" notice, not a real warning. +- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /std:c++14 /wd4250") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS -D_WIN32_WINNT=${BOOST_WINDOWS_VERSION} -DWIN32 -DBOOST_ASIO_DISABLE_IOCP /EHsc /wd4250") + set(USE_RT "") + link_directories(${Boost_LIBRARY_DIR_DEBUG}) + elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") + set(USE_RT "") + else() +- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} -std=c++14 ${NO_DEPRECATED} ${EXPORTSYMBOLS}") ++ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OS_CXX_FLAGS} -g ${OPTIMIZE} ${NO_DEPRECATED} ${EXPORTSYMBOLS}") + set(USE_RT "rt") + endif() + +@@ -268,6 +270,7 @@ list(SORT ${VSOMEIP_NAME}-cfg_SRC) + if (VSOMEIP_ENABLE_MULTIPLE_ROUTING_MANAGERS EQUAL 0) + add_library(${VSOMEIP_NAME}-cfg SHARED ${${VSOMEIP_NAME}-cfg_SRC}) + set_target_properties (${VSOMEIP_NAME}-cfg PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) ++ target_compile_features(${VSOMEIP_NAME}-cfg PRIVATE cxx_std_17) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-cfg PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") + endif() +@@ -302,6 +305,7 @@ list(SORT ${VSOMEIP_NAME}_SRC) + + add_library(${VSOMEIP_NAME} SHARED ${${VSOMEIP_NAME}_SRC}) + set_target_properties (${VSOMEIP_NAME} PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) ++target_compile_features(${VSOMEIP_NAME} PRIVATE cxx_std_17) + if (MSVC) + set_target_properties(${VSOMEIP_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION") + else () +@@ -331,6 +335,7 @@ file(GLOB ${VSOMEIP_NAME}-sd_SRC + list(SORT ${VSOMEIP_NAME}-sd_SRC) + + add_library(${VSOMEIP_NAME}-sd SHARED ${${VSOMEIP_NAME}-sd_SRC}) ++target_compile_features(${VSOMEIP_NAME}-sd PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_NAME}-sd PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-sd PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +@@ -348,6 +353,7 @@ file(GLOB_RECURSE ${VSOMEIP_NAME}-e2e_SRC + list(SORT ${VSOMEIP_NAME}-e2e_SRC) + + add_library(${VSOMEIP_NAME}-e2e SHARED ${${VSOMEIP_NAME}-e2e_SRC}) ++target_compile_features(${VSOMEIP_NAME}-e2e PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_NAME}-e2e PROPERTIES VERSION ${VSOMEIP_VERSION} SOVERSION ${VSOMEIP_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_NAME}-e2e PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +@@ -375,6 +381,7 @@ file(GLOB_RECURSE ${VSOMEIP_COMPAT_NAME}_SRC + list(SORT ${VSOMEIP_COMPAT_NAME}_SRC) + + add_library(${VSOMEIP_COMPAT_NAME} SHARED ${${VSOMEIP_COMPAT_NAME}_SRC}) ++target_compile_features(${VSOMEIP_COMPAT_NAME} PRIVATE cxx_std_17) + set_target_properties (${VSOMEIP_COMPAT_NAME} PROPERTIES VERSION ${VSOMEIP_COMPAT_VERSION} SOVERSION ${VSOMEIP_COMPAT_MAJOR_VERSION}) + if (MSVC) + set_target_properties(${VSOMEIP_COMPAT_NAME} PROPERTIES COMPILE_DEFINITIONS "VSOMEIP_DLL_COMPILATION_PLUGIN") +diff --git a/examples/hello_world/hello_world_service.hpp b/examples/hello_world/hello_world_service.hpp +index 7ac3b1e7..b04cacea 100644 +--- a/examples/hello_world/hello_world_service.hpp ++++ b/examples/hello_world/hello_world_service.hpp +@@ -11,12 +11,12 @@ + #if defined ANDROID || defined __ANDROID__ + #include "android/log.h" + #define LOG_TAG "hello_world_service" +-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) +-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) ++#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n"), (void)__android_log_print(ANDROID_LOG_INFO, LOG_TAG, ##__VA_ARGS__) ++#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n"), (void)__android_log_print(ANDROID_LOG_ERROR, LOG_TAG, ##__VA_ARGS__) + #else + #include <cstdio> +-#define LOG_INF(...) fprintf(stdout, __VA_ARGS__), fprintf(stdout, "\n") +-#define LOG_ERR(...) fprintf(stderr, __VA_ARGS__), fprintf(stderr, "\n") ++#define LOG_INF(...) std::fprintf(stdout, __VA_ARGS__), std::fprintf(stdout, "\n") ++#define LOG_ERR(...) std::fprintf(stderr, __VA_ARGS__), std::fprintf(stderr, "\n") + #endif + + static vsomeip::service_t service_id = 0x1111; +@@ -32,9 +32,9 @@ public: + hello_world_service() : + rtm_(vsomeip::runtime::get()), + app_(rtm_->create_application()), +- stop_(false), +- stop_thread_(std::bind(&hello_world_service::stop, this)) ++ stop_(false) + { ++ stop_thread_ = std::thread{&hello_world_service::stop, this}; + } + + ~hello_world_service() +diff --git a/implementation/configuration/include/internal.hpp.in b/implementation/configuration/include/internal.hpp.in +index 72c8d503..eff4efad 100644 +--- a/implementation/configuration/include/internal.hpp.in ++++ b/implementation/configuration/include/internal.hpp.in +@@ -141,14 +141,14 @@ typedef enum { + IS_SUBSCRIBING + } subscription_state_e; + +-const std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + +-const std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + + #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 + #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 + +-const std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); ++inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = (std::numeric_limits<std::uint32_t>::max)(); + + const std::uint32_t ANY_UID = 0xFFFFFFFF; + const std::uint32_t ANY_GID = 0xFFFFFFFF; +diff --git a/implementation/configuration/include/internal_android.hpp b/implementation/configuration/include/internal_android.hpp +index f5425722..8757a85a 100644 +--- a/implementation/configuration/include/internal_android.hpp ++++ b/implementation/configuration/include/internal_android.hpp +@@ -128,17 +128,17 @@ typedef enum { + IS_SUBSCRIBING + } subscription_state_e; + +-const std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t MESSAGE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + +-const std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t QUEUE_SIZE_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + + #define VSOMEIP_DEFAULT_NPDU_DEBOUNCING_NANO 2 * 1000 * 1000 + #define VSOMEIP_DEFAULT_NPDU_MAXIMUM_RETENTION_NANO 5 * 1000 * 1000 + +-const std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); ++inline constexpr std::uint32_t MAX_RECONNECTS_UNLIMITED = std::numeric_limits<std::uint32_t>::max(); + +-const std::uint32_t ANY_UID = 0xFFFFFFFF; +-const std::uint32_t ANY_GID = 0xFFFFFFFF; ++inline constexpr std::uint32_t ANY_UID = 0xFFFFFFFF; ++inline constexpr std::uint32_t ANY_GID = 0xFFFFFFFF; + + enum class port_type_e { + PT_OPTIONAL, +diff --git a/implementation/configuration/src/configuration_impl.cpp b/implementation/configuration/src/configuration_impl.cpp +index ca1bd1dc..380b2906 100644 +--- a/implementation/configuration/src/configuration_impl.cpp ++++ b/implementation/configuration/src/configuration_impl.cpp +@@ -333,7 +333,7 @@ bool configuration_impl::load(const std::string &_name) { + + // Tell, if reading of configuration file(s) failed. + // (This may file if the logger configuration is incomplete/missing). +- for (auto f : its_failed) ++ for (const auto& f : its_failed) + VSOMEIP_WARNING << "Reading of configuration file \"" + << f << "\" failed. Configuration may be incomplete."; + +@@ -342,7 +342,7 @@ bool configuration_impl::load(const std::string &_name) { + + std::chrono::steady_clock::time_point end = std::chrono::steady_clock::now(); + +- for (auto i : its_input) { ++ for (const auto& i : its_input) { + if (utility::is_file(i)) + VSOMEIP_INFO << "Using configuration file: \"" << i << "\"."; + +@@ -561,7 +561,7 @@ bool configuration_impl::load_data(const std::vector<configuration_element> &_el + + if (is_logging_loaded_) { + logger::logger_impl::init(shared_from_this()); +- for (auto w : its_warnings) ++ for (const auto& w : its_warnings) + VSOMEIP_WARNING << w; + } + } +@@ -3255,7 +3255,7 @@ void configuration_impl::trim(std::string &_s) { + std::find_if( + _s.begin(), + _s.end(), +- [](unsigned char ch) { return !std::isspace(ch); } ++ [](const auto ch) { return !std::isspace(ch); } + ) + ); + +@@ -3263,8 +3263,9 @@ void configuration_impl::trim(std::string &_s) { + std::find_if( + _s.rbegin(), + _s.rend(), +- [](unsigned char ch) { return !std::isspace(ch); }).base(), +- _s.end() ++ [](const auto ch) { return !std::isspace(ch); } ++ ).base(), ++ _s.end() + ); + } + +diff --git a/implementation/endpoints/include/endpoint_impl.hpp b/implementation/endpoints/include/endpoint_impl.hpp +index 9d2b303c..685eba4e 100644 +--- a/implementation/endpoints/include/endpoint_impl.hpp ++++ b/implementation/endpoints/include/endpoint_impl.hpp +@@ -34,6 +34,9 @@ public: + std::uint32_t _max_message_size, + configuration::endpoint_queue_limit_t _queue_limit, + const std::shared_ptr<configuration>& _configuration); ++ endpoint_impl(endpoint_impl<Protocol> const&) = delete; ++ endpoint_impl(endpoint_impl<Protocol> const&&) = delete; ++ + virtual ~endpoint_impl(); + + void enable_magic_cookies(); +diff --git a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp +index 53f4769a..b1d8991d 100644 +--- a/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp ++++ b/implementation/endpoints/include/local_server_endpoint_impl_receive_op.hpp +@@ -25,8 +25,8 @@ struct storage : + { + socket_type_t &socket_; + receive_handler_t handler_; +- byte_t *buffer_; +- std::size_t length_; ++ byte_t *buffer_ = nullptr; ++ size_t length_; + uid_t uid_; + gid_t gid_; + size_t bytes_; +diff --git a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp +index d7eede3f..e1e1aaa2 100644 +--- a/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp ++++ b/implementation/endpoints/include/local_uds_client_endpoint_impl.hpp +@@ -25,7 +25,7 @@ public: + const endpoint_type& _remote, + boost::asio::io_context &_io, + const std::shared_ptr<configuration>& _configuration); +- virtual ~local_uds_client_endpoint_impl(); ++ virtual ~local_uds_client_endpoint_impl() = default; + + void start(); + void stop(); +diff --git a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp +index 1e78822d..a4ed2eb5 100644 +--- a/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp ++++ b/implementation/endpoints/include/local_uds_server_endpoint_impl.hpp +@@ -50,7 +50,7 @@ public: + const std::shared_ptr<configuration>& _configuration, + bool _is_routing_endpoint); + +- virtual ~local_uds_server_endpoint_impl(); ++ virtual ~local_uds_server_endpoint_impl() = default; + + void start(); + void stop(); +diff --git a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp +index 1e4f0fe0..35638cd7 100644 +--- a/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp ++++ b/implementation/endpoints/include/udp_server_endpoint_impl_receive_op.hpp +@@ -35,7 +35,7 @@ struct storage : + socket_type_t &socket_; + endpoint_type_t &sender_; + receive_handler_t handler_; +- byte_t *buffer_; ++ byte_t *buffer_ = nullptr; + size_t length_; + std::uint8_t multicast_id_; + bool is_v4_; +diff --git a/implementation/endpoints/src/endpoint_manager_base.cpp b/implementation/endpoints/src/endpoint_manager_base.cpp +index 9dff9785..4e484454 100644 +--- a/implementation/endpoints/src/endpoint_manager_base.cpp ++++ b/implementation/endpoints/src/endpoint_manager_base.cpp +@@ -38,7 +38,7 @@ std::shared_ptr<endpoint> endpoint_manager_base::create_local(client_t _client) + return create_local_unlocked(_client); + } + +-void endpoint_manager_base::remove_local(client_t _client) { ++void endpoint_manager_base::remove_local(const client_t _client) { + std::shared_ptr<endpoint> its_endpoint(find_local(_client)); + if (its_endpoint) { + its_endpoint->register_error_handler(nullptr); +diff --git a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp +index 0b7e261c..56c621db 100644 +--- a/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/local_uds_client_endpoint_impl.cpp +@@ -40,12 +40,7 @@ local_uds_client_endpoint_impl::local_uds_client_endpoint_impl( + is_supporting_magic_cookies_ = false; + } + +-local_uds_client_endpoint_impl::~local_uds_client_endpoint_impl() { +- +-} +- + bool local_uds_client_endpoint_impl::is_local() const { +- + return true; + } + +diff --git a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp +index 948fe925..33876c56 100644 +--- a/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/local_uds_server_endpoint_impl.cpp +@@ -104,17 +104,11 @@ local_uds_server_endpoint_impl::local_uds_server_endpoint_impl( + #endif + } + +-local_uds_server_endpoint_impl::~local_uds_server_endpoint_impl() { +- +-} +- + bool local_uds_server_endpoint_impl::is_local() const { +- + return true; + } + + void local_uds_server_endpoint_impl::start() { +- + std::lock_guard<std::mutex> its_lock(acceptor_mutex_); + if (acceptor_.is_open()) { + connection::ptr new_connection = connection::create( +diff --git a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp +index f42d93d4..e6755157 100644 +--- a/implementation/endpoints/src/tcp_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/tcp_client_endpoint_impl.cpp +@@ -178,7 +178,7 @@ void tcp_client_endpoint_impl::connect() { + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(socket_->native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "TCP Client: Could not bind to device \"" << its_device << "\""; + } + } +diff --git a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp +index f83252ae..5aef72be 100644 +--- a/implementation/endpoints/src/tcp_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/tcp_server_endpoint_impl.cpp +@@ -55,7 +55,7 @@ tcp_server_endpoint_impl::tcp_server_endpoint_impl( + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(acceptor_.native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "TCP Server: Could not bind to device \"" << its_device << "\""; + } + } +@@ -295,8 +295,8 @@ void tcp_server_endpoint_impl::accept_cbk(const connection::ptr& _connection, + auto its_ep = std::dynamic_pointer_cast<tcp_server_endpoint_impl>( + shared_from_this()); + its_timer->async_wait([its_timer, its_ep] +- (const boost::system::error_code& _error) { +- if (!_error) { ++ (const boost::system::error_code& _error_inner) { ++ if (!_error_inner) { + its_ep->start(); + } + }); +@@ -853,12 +853,12 @@ void tcp_server_endpoint_impl::connection::handle_recv_buffer_exception( + << std::setfill('0') << std::hex; + + for (std::size_t i = 0; i < recv_buffer_size_ && i < 16; i++) { +- its_message << std::setw(2) << (int) (recv_buffer_[i]) << " "; ++ its_message << std::setw(2) << static_cast<int>(recv_buffer_[i]) << " "; + } + + its_message << " Last 16 Bytes captured: "; + for (int i = 15; recv_buffer_size_ > 15 && i >= 0; i--) { +- its_message << std::setw(2) << (int) (recv_buffer_[static_cast<size_t>(i)]) << " "; ++ its_message << std::setw(2) << static_cast<int>(recv_buffer_[static_cast<size_t>(i)]) << " "; + } + VSOMEIP_ERROR << its_message.str(); + recv_buffer_.clear(); +@@ -954,7 +954,7 @@ void tcp_server_endpoint_impl::print_status() { + std::lock_guard<std::mutex> its_lock(mutex_); + connections_t its_connections; + { +- std::lock_guard<std::mutex> its_lock(connections_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(connections_mutex_); + its_connections = connections_; + } + +@@ -1027,7 +1027,7 @@ void tcp_server_endpoint_impl::connection::wait_until_sent(const boost::system:: + } + } + { +- std::lock_guard<std::mutex> its_lock(its_server->connections_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(its_server->connections_mutex_); + stop(); + } + its_server->remove_connection(this); +diff --git a/implementation/endpoints/src/udp_client_endpoint_impl.cpp b/implementation/endpoints/src/udp_client_endpoint_impl.cpp +index d6952228..f52b2354 100644 +--- a/implementation/endpoints/src/udp_client_endpoint_impl.cpp ++++ b/implementation/endpoints/src/udp_client_endpoint_impl.cpp +@@ -67,7 +67,7 @@ void udp_client_endpoint_impl::connect() { + << get_address_port_remote(); + } + socket_->set_option(boost::asio::socket_base::receive_buffer_size( +- udp_receive_buffer_size_), its_error); ++ static_cast<int>(udp_receive_buffer_size_)), its_error); + if (its_error) { + VSOMEIP_WARNING << "udp_client_endpoint_impl::connect: couldn't set " + << "SO_RCVBUF: " << its_error.message() +diff --git a/implementation/endpoints/src/udp_server_endpoint_impl.cpp b/implementation/endpoints/src/udp_server_endpoint_impl.cpp +index 48e35c5d..587fb94c 100644 +--- a/implementation/endpoints/src/udp_server_endpoint_impl.cpp ++++ b/implementation/endpoints/src/udp_server_endpoint_impl.cpp +@@ -72,7 +72,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( + std::string its_device(configuration_->get_device()); + if (its_device != "") { + if (setsockopt(unicast_socket_.native_handle(), +- SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), (socklen_t)its_device.size()) == -1) { ++ SOL_SOCKET, SO_BINDTODEVICE, its_device.c_str(), static_cast<socklen_t>(its_device.size())) == -1) { + VSOMEIP_WARNING << "UDP Server: Could not bind to device \"" << its_device << "\""; + } + } +@@ -108,7 +108,7 @@ udp_server_endpoint_impl::udp_server_endpoint_impl( + const int its_udp_recv_buffer_size = + configuration_->get_udp_receive_buffer_size(); + unicast_socket_.set_option(boost::asio::socket_base::receive_buffer_size( +- its_udp_recv_buffer_size), ec); ++ static_cast<int>(its_udp_recv_buffer_size)), ec); + + if (ec) { + VSOMEIP_WARNING << "udp_server_endpoint_impl: couldn't set " +diff --git a/implementation/message/include/message_base_impl.hpp b/implementation/message/include/message_base_impl.hpp +index acad2e89..2c953e98 100644 +--- a/implementation/message/include/message_base_impl.hpp ++++ b/implementation/message/include/message_base_impl.hpp +@@ -6,8 +6,6 @@ + #ifndef VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP + #define VSOMEIP_V3_MESSAGE_BASE_IMPL_HPP + +-#include <boost/thread.hpp> +- + #include <vsomeip/export.hpp> + #include <vsomeip/message.hpp> + +diff --git a/implementation/message/src/deserializer.cpp b/implementation/message/src/deserializer.cpp +index 3c4eddfa..bfa723d3 100644 +--- a/implementation/message/src/deserializer.cpp ++++ b/implementation/message/src/deserializer.cpp +@@ -115,8 +115,8 @@ bool deserializer::deserialize(std::string &_target, std::size_t _length) { + if (_length > remaining_ || _length > _target.capacity()) { + return false; + } +- _target.assign(position_, position_ + long(_length)); +- position_ += long(_length); ++ _target.assign(position_, position_ + static_cast<std::vector<byte_t>::difference_type>(_length)); ++ position_ += static_cast<std::vector<byte_t>::difference_type>(_length); + remaining_ -= _length; + + return true; +diff --git a/implementation/plugin/src/plugin_manager_impl.cpp b/implementation/plugin/src/plugin_manager_impl.cpp +index bea96d01..23b7b892 100644 +--- a/implementation/plugin/src/plugin_manager_impl.cpp ++++ b/implementation/plugin/src/plugin_manager_impl.cpp +@@ -164,7 +164,7 @@ bool plugin_manager_impl::unload_plugin(plugin_type_e _type) { + } + } else { + VSOMEIP_ERROR << "plugin_manager_impl::unload_plugin didn't find plugin" +- << " type:" << (int)_type; ++ << " type:" << static_cast<int>(_type); + return false; + } + return plugins_.erase(_type); +diff --git a/implementation/routing/src/routing_manager_base.cpp b/implementation/routing/src/routing_manager_base.cpp +index dde6b260..047e6566 100644 +--- a/implementation/routing/src/routing_manager_base.cpp ++++ b/implementation/routing/src/routing_manager_base.cpp +@@ -1184,8 +1184,8 @@ void routing_manager_base::remove_local(client_t _client, + std::lock_guard<std::mutex> its_lock(local_services_mutex_); + // Finally remove all services that are implemented by the client. + std::set<std::pair<service_t, instance_t>> its_services; +- for (auto& s : local_services_) { +- for (auto& i : s.second) { ++ for (const auto& s : local_services_) { ++ for (const auto& i : s.second) { + if (std::get<2>(i.second) == _client) { + its_services.insert({ s.first, i.first }); + host_->on_availability(s.first, i.first, availability_state_e::AS_UNAVAILABLE, +@@ -1202,9 +1202,9 @@ void routing_manager_base::remove_local(client_t _client, + + // remove disconnected client from offer service history + std::set<std::tuple<service_t, instance_t, client_t>> its_clients; +- for (auto& s : local_services_history_) { +- for (auto& i : s.second) { +- for (auto& c : i.second) { ++ for (const auto& s : local_services_history_) { ++ for (const auto& i : s.second) { ++ for (const auto& c : i.second) { + if (c == _client) { + its_clients.insert(std::make_tuple(s.first, i.first, c)); + } +diff --git a/implementation/runtime/include/application_impl.hpp b/implementation/runtime/include/application_impl.hpp +index 67187a87..c647b531 100644 +--- a/implementation/runtime/include/application_impl.hpp ++++ b/implementation/runtime/include/application_impl.hpp +@@ -309,7 +309,7 @@ private: + std::shared_ptr<sync_handler> get_next_handler(); + void reschedule_availability_handler(const std::shared_ptr<sync_handler> &_handler); + bool has_active_dispatcher(); +- bool is_active_dispatcher(const std::thread::id &_id); ++ bool is_active_dispatcher(const std::thread::id &_id) const; + void remove_elapsed_dispatchers(); + + void shutdown(); +@@ -436,7 +436,7 @@ private: + // Dispatcher threads that are running + std::set<std::thread::id> running_dispatchers_; + // Mutex to protect access to dispatchers_ & elapsed_dispatchers_ +- std::mutex dispatcher_mutex_; ++ mutable std::mutex dispatcher_mutex_; + + // Condition to wakeup the dispatcher thread + mutable std::condition_variable dispatcher_condition_; +diff --git a/implementation/runtime/src/application_impl.cpp b/implementation/runtime/src/application_impl.cpp +index aba906b7..db880b42 100644 +--- a/implementation/runtime/src/application_impl.cpp ++++ b/implementation/runtime/src/application_impl.cpp +@@ -426,7 +426,8 @@ void application_impl::start() { + std::lock_guard<std::mutex> its_lock(dispatcher_mutex_); + is_dispatching_ = true; + auto its_main_dispatcher = std::make_shared<std::thread>( +- std::bind(&application_impl::main_dispatch, shared_from_this())); ++ &application_impl::main_dispatch, shared_from_this() ++ ); + dispatchers_[its_main_dispatcher->get_id()] = its_main_dispatcher; + } + +@@ -1792,7 +1793,7 @@ void application_impl::main_dispatch() { + } + } else { + std::shared_ptr<sync_handler> its_handler; +- while (is_dispatching_ && is_active_dispatcher(its_id) ++ while (is_dispatching_ && is_active_dispatcher(its_id) + && (its_handler = get_next_handler())) { + its_lock.unlock(); + invoke_handler(its_handler); +@@ -2048,7 +2049,7 @@ bool application_impl::has_active_dispatcher() { + return false; + } + +-bool application_impl::is_active_dispatcher(const std::thread::id &_id) { ++bool application_impl::is_active_dispatcher(const std::thread::id &_id) const { + while (is_dispatching_) { + if (dispatcher_mutex_.try_lock()) { + for (const auto &d : dispatchers_) { +diff --git a/implementation/security/src/policy.cpp b/implementation/security/src/policy.cpp +index 36341223..da0bbd86 100644 +--- a/implementation/security/src/policy.cpp ++++ b/implementation/security/src/policy.cpp +@@ -175,7 +175,7 @@ policy::deserialize_ids(const byte_t * &_data, uint32_t &_size, + if (its_result == false) + return false; + +- for (const auto i : its_instances) ++ for (const auto& i : its_instances) + its_ids += std::make_pair(i, its_methods); + + its_array_length -= (its_current_size - _size); +@@ -379,7 +379,7 @@ policy::serialize_interval_set( + uint32_t its_interval_set_size(0); + serialize_u32(its_interval_set_size, _data); + +- for (const auto i : _intervals) ++ for (const auto& i : _intervals) + serialize_interval(i, _data); + + its_interval_set_size = static_cast<uint32_t>(_data.size() +diff --git a/implementation/security/src/security.cpp b/implementation/security/src/security.cpp +index a3b6ab3f..19ff73da 100644 +--- a/implementation/security/src/security.cpp ++++ b/implementation/security/src/security.cpp +@@ -14,6 +14,7 @@ + #include "../../plugin/include/plugin_manager.hpp" + + #include <array> ++#include <iomanip> + #include <tuple> + + #ifndef _WIN32 +diff --git a/implementation/service_discovery/src/service_discovery_impl.cpp b/implementation/service_discovery/src/service_discovery_impl.cpp +index de6e8467..c3880457 100644 +--- a/implementation/service_discovery/src/service_discovery_impl.cpp ++++ b/implementation/service_discovery/src/service_discovery_impl.cpp +@@ -5,8 +5,10 @@ + + #include <vsomeip/constants.hpp> + +-#include <random> ++#include <chrono> ++#include <iomanip> + #include <forward_list> ++#include <random> + #include <thread> + + #include <vsomeip/internal/logger.hpp> +@@ -869,7 +871,7 @@ service_discovery_impl::create_eventgroup_entry( + << std::setw(4) << _service << "." + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "] " +- << (uint16_t) _reliability_type; ++ << static_cast<uint16_t>(_reliability_type); + return its_data; + } + std::shared_ptr<eventgroupentry_impl> its_entry, its_other; +@@ -1074,7 +1076,7 @@ service_discovery_impl::insert_subscription_ack( + // Selective + if (_clients.size() > 1 || (*(_clients.begin())) != 0) { + auto its_selective_option = std::make_shared<selective_option_impl>(); +- (void)its_selective_option->set_clients(_clients); ++ static_cast<void>(its_selective_option->set_clients(_clients)); + + its_data.options_.push_back(its_selective_option); + } +@@ -1136,7 +1138,7 @@ service_discovery_impl::on_message( + static bool must_start_last_msg_received_timer(true); + boost::system::error_code ec; + +- std::lock_guard<std::mutex> its_lock(last_msg_received_timer_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(last_msg_received_timer_mutex_); + if (0 < last_msg_received_timer_.cancel(ec) || must_start_last_msg_received_timer) { + must_start_last_msg_received_timer = false; + last_msg_received_timer_.expires_from_now( +@@ -1272,7 +1274,7 @@ service_discovery_impl::on_message( + } + + { +- std::unique_lock<std::recursive_mutex> its_lock(its_acknowledgement->get_lock()); ++ std::unique_lock<std::recursive_mutex> its_lock_inner(its_acknowledgement->get_lock()); + its_acknowledgement->complete(); + // TODO: Check the following logic... + if (its_acknowledgement->has_subscription()) { +@@ -1543,7 +1545,7 @@ service_discovery_impl::process_offerservice_serviceentry( + << std::setw(4) << _instance << "." + << std::setw(4) << eg << "]" + << " using reliability type: " +- << std::setw(4) << (uint16_t) offer_type; ++ << std::setw(4) << static_cast<uint16_t>(offer_type); + its_info->set_reliability(offer_type); + } + } +@@ -1947,7 +1949,7 @@ service_discovery_impl::process_eventgroupentry( + << ": SOME/IP length field in SubscribeEventGroup message header: [" + << std::dec << _entry->get_owning_message()->get_someip_length() + << "] bytes, is shorter than length of deserialized message: [" +- << (uint32_t) _entry->get_owning_message()->get_length() << "] bytes. " ++ << static_cast<uint32_t>(_entry->get_owning_message()->get_length()) << "] bytes. " + << its_sender.to_string(ec) << " session: " + << std::hex << std::setw(4) << std::setfill('0') << its_session; + return; +@@ -2238,7 +2240,7 @@ service_discovery_impl::process_eventgroupentry( + boost::system::error_code ec; + VSOMEIP_WARNING << __func__ + << ": Unsupported eventgroup option [" +- << std::hex << (int)its_option->get_type() << "] " ++ << std::hex << static_cast<int>(its_option->get_type()) << "] " + << its_sender.to_string(ec) << " session: " + << std::hex << std::setw(4) << std::setfill('0') << its_session; + if (its_ttl > 0) { +@@ -2332,7 +2334,7 @@ service_discovery_impl::handle_eventgroup_subscription( + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " not valid: Event configuration (" +- << (std::uint32_t)_info->get_reliability() ++ << static_cast<std::uint32_t>(_info->get_reliability()) + << ") does not match the provided endpoint options: " + << _first_address.to_string(ec) << ":" << std::dec << _first_port << " " + << _second_address.to_string(ec) << ":" << _second_port; +@@ -2355,14 +2357,14 @@ service_discovery_impl::handle_eventgroup_subscription( + boost::system::error_code ec; + // TODO: Add session id + VSOMEIP_ERROR << __func__ +- << ": Requested major version:[" << (uint32_t) _major ++ << ": Requested major version:[" << static_cast<uint32_t>(_major) + << "] in subscription to service: [" + << std::hex << std::setfill('0') + << std::setw(4) << _service << "." + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " does not match with services major version:[" +- << (uint32_t) _info->get_major() << "] subscriber: " ++ << static_cast<uint32_t>(_info->get_major()) << "] subscriber: " + << _first_address.to_string(ec) << ":" << std::dec << _first_port; + if (_ttl > 0) { + insert_subscription_ack(_acknowledgement, its_info, 0, nullptr, _clients); +@@ -3107,8 +3109,8 @@ service_discovery_impl::move_offers_into_main_phase( + const auto its_timer = repetition_phase_timers_.find(_timer); + if (its_timer != repetition_phase_timers_.end()) { + for (const auto& its_service : its_timer->second) { +- for (const auto& instance : its_service.second) { +- instance.second->set_is_in_mainphase(true); ++ for (const auto& its_instance : its_service.second) { ++ its_instance.second->set_is_in_mainphase(true); + } + } + repetition_phase_timers_.erase(_timer); +@@ -3125,7 +3127,7 @@ service_discovery_impl::stop_offer_service( + bool stop_offer_required(false); + // Delete from initial phase offers + { +- std::lock_guard<std::mutex> its_lock(collected_offers_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(collected_offers_mutex_); + if (collected_offers_.size()) { + auto its_service_it = collected_offers_.find(its_service); + if (its_service_it != collected_offers_.end()) { +@@ -3147,7 +3149,7 @@ service_discovery_impl::stop_offer_service( + + // Delete from repetition phase offers + { +- std::lock_guard<std::mutex> its_lock(repetition_phase_timers_mutex_); ++ std::lock_guard<std::mutex> its_lock_inner(repetition_phase_timers_mutex_); + for (auto rpt = repetition_phase_timers_.begin(); + rpt != repetition_phase_timers_.end();) { + auto its_service_it = rpt->second.find(its_service); +@@ -3866,7 +3868,7 @@ reliability_type_e service_discovery_impl::get_eventgroup_reliability( + << std::setw(4) << _instance << "." + << std::setw(4) << _eventgroup << "]" + << " using reliability type: " +- << std::setw(4) << (uint16_t) its_reliability; ++ << std::setw(4) << static_cast<uint16_t>(its_reliability); + its_info->set_reliability(its_reliability); + } + } else { +diff --git a/interface/vsomeip/constants.hpp b/interface/vsomeip/constants.hpp +index 2b040c5e..2519b57f 100644 +--- a/interface/vsomeip/constants.hpp ++++ b/interface/vsomeip/constants.hpp +@@ -13,54 +13,54 @@ + + namespace vsomeip_v3 { + +-const major_version_t DEFAULT_MAJOR = 0x00; +-const minor_version_t DEFAULT_MINOR = 0x00000000; +-const ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" ++inline constexpr major_version_t DEFAULT_MAJOR = 0x00; ++inline constexpr minor_version_t DEFAULT_MINOR = 0x00000000; ++inline constexpr ttl_t DEFAULT_TTL = 0xFFFFFF; // "until next reboot" + + const std::string DEFAULT_MULTICAST = "224.0.0.0"; +-const uint16_t DEFAULT_PORT = 30500; +-const uint16_t ILLEGAL_PORT = 0xFFFF; +-const uint16_t ANY_PORT = 0; +- +-const uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; +- +-const service_t ANY_SERVICE = 0xFFFF; +-const instance_t ANY_INSTANCE = 0xFFFF; +-const eventgroup_t ANY_EVENTGROUP = 0xFFFF; +-const method_t ANY_METHOD = 0xFFFF; +-const major_version_t ANY_MAJOR = 0xFF; +-const minor_version_t ANY_MINOR = 0xFFFFFFFF; +- +-const eventgroup_t DEFAULT_EVENTGROUP = 0x0001; +- +-const client_t ILLEGAL_CLIENT = 0x0000; +-const method_t INVALID_METHOD = 0x0000; +- +-const byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; +-const byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; +-const length_t MAGIC_COOKIE_SIZE = 0x00000008; +-const request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; +-const client_t MAGIC_COOKIE_CLIENT = 0xDEAD; +-const protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; +-const interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; +-const message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = ++inline constexpr uint16_t DEFAULT_PORT = 30500; ++inline constexpr uint16_t ILLEGAL_PORT = 0xFFFF; ++inline constexpr uint16_t ANY_PORT = 0; ++ ++inline constexpr uint16_t NO_TRACE_FILTER_EXPRESSION = 0x0000; ++ ++inline constexpr service_t ANY_SERVICE = 0xFFFF; ++inline constexpr instance_t ANY_INSTANCE = 0xFFFF; ++inline constexpr eventgroup_t ANY_EVENTGROUP = 0xFFFF; ++inline constexpr method_t ANY_METHOD = 0xFFFF; ++inline constexpr major_version_t ANY_MAJOR = 0xFF; ++inline constexpr minor_version_t ANY_MINOR = 0xFFFFFFFF; ++ ++inline constexpr eventgroup_t DEFAULT_EVENTGROUP = 0x0001; ++ ++inline constexpr client_t ILLEGAL_CLIENT = 0x0000; ++inline constexpr method_t INVALID_METHOD = 0x0000; ++ ++inline constexpr byte_t MAGIC_COOKIE_CLIENT_MESSAGE = 0x00; ++inline constexpr byte_t MAGIC_COOKIE_SERVICE_MESSAGE = 0x80; ++inline constexpr length_t MAGIC_COOKIE_SIZE = 0x00000008; ++inline constexpr request_t MAGIC_COOKIE_REQUEST = 0xDEADBEEF; ++inline constexpr client_t MAGIC_COOKIE_CLIENT = 0xDEAD; ++inline constexpr protocol_version_t MAGIC_COOKIE_PROTOCOL_VERSION = 0x01; ++inline constexpr interface_version_t MAGIC_COOKIE_INTERFACE_VERSION = 0x01; ++inline constexpr message_type_e MAGIC_COOKIE_CLIENT_MESSAGE_TYPE = + message_type_e::MT_REQUEST_NO_RETURN; +-const message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = ++inline constexpr message_type_e MAGIC_COOKIE_SERVICE_MESSAGE_TYPE = + message_type_e::MT_NOTIFICATION; +-const return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; ++inline constexpr return_code_e MAGIC_COOKIE_RETURN_CODE = return_code_e::E_OK; + +-const byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, ++inline constexpr byte_t CLIENT_COOKIE[] = { 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, + 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x01, 0x00 }; + +-const byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, ++inline constexpr byte_t SERVICE_COOKIE[] = { 0xFF, 0xFF, 0x80, 0x00, 0x00, 0x00, 0x00, + 0x08, 0xDE, 0xAD, 0xBE, 0xEF, 0x01, 0x01, 0x02, 0x00 }; + +-const event_t ANY_EVENT = 0xFFFF; +-const client_t ANY_CLIENT = 0xFFFF; ++inline constexpr event_t ANY_EVENT = 0xFFFF; ++inline constexpr client_t ANY_CLIENT = 0xFFFF; + +-const int VSOMEIP_ALL = -1; ++inline constexpr int VSOMEIP_ALL = -1; + +-const pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; ++inline constexpr pending_security_update_id_t DEFAULT_SECURITY_UPDATE_ID = 0x0; + + } // namespace vsomeip_v3 + +diff --git a/test/network_tests/application_tests/application_test.cpp b/test/network_tests/application_tests/application_test.cpp +index a4a1923d..c70b6cd5 100644 +--- a/test/network_tests/application_tests/application_test.cpp ++++ b/test/network_tests/application_tests/application_test.cpp +@@ -3,6 +3,7 @@ + // License, v. 2.0. If a copy of the MPL was not distributed with this + // file, You can obtain one at http://mozilla.org/MPL/2.0/. + ++#include <atomic> + #include <thread> + #include <mutex> + #include <condition_variable> +diff --git a/tools/vsomeip_ctrl.cpp b/tools/vsomeip_ctrl.cpp +index 74510427..3e74a832 100644 +--- a/tools/vsomeip_ctrl.cpp ++++ b/tools/vsomeip_ctrl.cpp +@@ -29,7 +29,6 @@ public: + instance_(_instance), + app_(vsomeip::runtime::get()->create_application("vsomeip_ctrl")), + wait_service_available_(true), +- send_thread_(std::bind(&vsomeip_sender::send, this)), + service_id_(0x0), + method_id_(0x0), + length_(0), +@@ -39,6 +38,8 @@ public: + return_code_(vsomeip::return_code_e::E_UNKNOWN), + wait_for_answer_(true) + { ++ send_thread_ = std::thread{&vsomeip_sender::send, this}; ++ + if (user_message_.size() < VSOMEIP_PAYLOAD_POS) { + VSOMEIP_ERROR << "Provided message is to short, min. length " + "is 16 Bytes, exiting."; +@@ -117,11 +118,11 @@ public: + << std::setw(4) << _response->get_instance() << "]:"; + VSOMEIP_INFO << "########## begin message"; + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') +- << _response->get_service() ++ << _response->get_service() + << std::hex << std::setw(4) << std::setfill('0') + << _response->get_method() + << " # service id / instance id"; +- VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') ++ VSOMEIP_INFO << std::hex << std::setw(8) << std::setfill('0') + << _response->get_length() << " # length"; + VSOMEIP_INFO << std::hex << std::setw(4) << std::setfill('0') + << _response->get_client() +@@ -243,7 +244,7 @@ private: + } + + if (use_tcp_ && user_message_.size() > VSOMEIP_MAX_TCP_MESSAGE_SIZE) { +- VSOMEIP_WARNING << "Max allowed message size for TCP is " ++ VSOMEIP_WARNING << "Max allowed message size for TCP is " + << std::dec << VSOMEIP_MAX_TCP_MESSAGE_SIZE + << ". Provided message size is: " << user_message_.size(); + } diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch new file mode 100644 index 0000000000..b15c8029ec --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip/0002-network_tests-Include-iomanip-system-header.patch @@ -0,0 +1,324 @@ +From 9b806483d804ab335f7161fdd6248ae3e7ae3bde Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 9 Aug 2024 13:50:05 -0700 +Subject: [PATCH 2/2] network_tests: Include iomanip system header + +Latest gcc-14/clang-18 needs this header for setfill and setw + +Upstream-Status: Submitted [https://github.com/COVESA/vsomeip/pull/751] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../network_tests/big_payload_tests/big_payload_test_service.hpp | 1 + + test/network_tests/cpu_load_tests/cpu_load_test_service.cpp | 1 + + test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp | 1 + + test/network_tests/e2e_tests/e2e_test_client.hpp | 1 + + test/network_tests/e2e_tests/e2e_test_service.hpp | 1 + + test/network_tests/event_tests/event_test_service.cpp | 1 + + .../header_factory_tests/header_factory_test_client.hpp | 1 + + .../header_factory_tests/header_factory_test_service.hpp | 1 + + test/network_tests/npdu_tests/npdu_test_client.hpp | 1 + + test/network_tests/npdu_tests/npdu_test_service.hpp | 1 + + test/network_tests/payload_tests/payload_test_client.hpp | 1 + + test/network_tests/payload_tests/payload_test_service.hpp | 1 + + .../restart_routing_tests/restart_routing_test_client.hpp | 1 + + .../restart_routing_tests/restart_routing_test_service.hpp | 1 + + .../routing_tests/external_local_routing_test_service.hpp | 1 + + test/network_tests/routing_tests/local_routing_test_client.hpp | 1 + + test/network_tests/routing_tests/local_routing_test_service.hpp | 1 + + .../second_address_tests/second_address_test_service.cpp | 1 + + test/network_tests/security_tests/security_test_client.hpp | 1 + + test/network_tests/security_tests/security_test_service.hpp | 1 + + .../suspend_resume_tests/suspend_resume_test_service.cpp | 1 + + 24 files changed, 24 insertions(+) + +diff --git a/test/network_tests/big_payload_tests/big_payload_test_service.hpp b/test/network_tests/big_payload_tests/big_payload_test_service.hpp +index 44af28a9..101b6758 100644 +--- a/test/network_tests/big_payload_tests/big_payload_test_service.hpp ++++ b/test/network_tests/big_payload_tests/big_payload_test_service.hpp +@@ -14,6 +14,7 @@ + #include <condition_variable> + #include <functional> + #include <queue> ++#include <iomanip> + + #include "big_payload_test_globals.hpp" + #include <vsomeip/internal/logger.hpp> +diff --git a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp +index 3d935e39..a98f3edf 100644 +--- a/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp ++++ b/test/network_tests/cpu_load_tests/cpu_load_test_service.cpp +@@ -13,6 +13,7 @@ + #include <functional> + #include <numeric> + #include <cmath> // for isfinite ++#include <iomanip> + + #include "cpu_load_test_globals.hpp" + #include <vsomeip/internal/logger.hpp> +diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp +index ad002913..82d5e7e2 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_04_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_profile_04_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp +index 25617917..17852b85 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_04_test_service.hpp +@@ -17,6 +17,7 @@ + #include <condition_variable> + #include <mutex> + #include <thread> ++#include <iomanip> + + class e2e_profile_04_test_service { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp +index 9b10a589..30d889b5 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_07_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_profile_07_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp +index ad6488a5..ea1cc05c 100644 +--- a/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_profile_07_test_service.hpp +@@ -17,6 +17,7 @@ + #include <condition_variable> + #include <mutex> + #include <thread> ++#include <iomanip> + + class e2e_profile_07_test_service { + public: +diff --git a/test/network_tests/e2e_tests/e2e_test_client.hpp b/test/network_tests/e2e_tests/e2e_test_client.hpp +index 10f49784..c253f101 100644 +--- a/test/network_tests/e2e_tests/e2e_test_client.hpp ++++ b/test/network_tests/e2e_tests/e2e_test_client.hpp +@@ -18,6 +18,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class e2e_test_client { + public: +diff --git a/test/network_tests/e2e_tests/e2e_test_service.hpp b/test/network_tests/e2e_tests/e2e_test_service.hpp +index 7fd1c5a9..e839aacb 100644 +--- a/test/network_tests/e2e_tests/e2e_test_service.hpp ++++ b/test/network_tests/e2e_tests/e2e_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class e2e_test_service { + public: +diff --git a/test/network_tests/event_tests/event_test_service.cpp b/test/network_tests/event_tests/event_test_service.cpp +index 3728a827..d1f117e2 100644 +--- a/test/network_tests/event_tests/event_test_service.cpp ++++ b/test/network_tests/event_tests/event_test_service.cpp +@@ -10,6 +10,7 @@ + #include <thread> + #include <map> + #include <atomic> ++#include <iomanip> + + #include <gtest/gtest.h> + +diff --git a/test/network_tests/header_factory_tests/header_factory_test_client.hpp b/test/network_tests/header_factory_tests/header_factory_test_client.hpp +index 79461b69..b72bbdca 100644 +--- a/test/network_tests/header_factory_tests/header_factory_test_client.hpp ++++ b/test/network_tests/header_factory_tests/header_factory_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/header_factory_tests/header_factory_test_service.hpp b/test/network_tests/header_factory_tests/header_factory_test_service.hpp +index 7879946a..a553adde 100644 +--- a/test/network_tests/header_factory_tests/header_factory_test_service.hpp ++++ b/test/network_tests/header_factory_tests/header_factory_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/npdu_tests/npdu_test_client.hpp b/test/network_tests/npdu_tests/npdu_test_client.hpp +index 2f469d40..7f615f14 100644 +--- a/test/network_tests/npdu_tests/npdu_test_client.hpp ++++ b/test/network_tests/npdu_tests/npdu_test_client.hpp +@@ -15,6 +15,7 @@ + #include <condition_variable> + #include <functional> + #include <map> ++#include <iomanip> + + #include "../npdu_tests/npdu_test_globals.hpp" + #include "../someip_test_globals.hpp" +diff --git a/test/network_tests/npdu_tests/npdu_test_service.hpp b/test/network_tests/npdu_tests/npdu_test_service.hpp +index bef06806..1caae785 100644 +--- a/test/network_tests/npdu_tests/npdu_test_service.hpp ++++ b/test/network_tests/npdu_tests/npdu_test_service.hpp +@@ -15,6 +15,7 @@ + #include <functional> + #include <chrono> + #include <deque> ++#include <iomanip> + + class npdu_test_service + { +diff --git a/test/network_tests/payload_tests/payload_test_client.hpp b/test/network_tests/payload_tests/payload_test_client.hpp +index 1bab6ba6..1754320c 100644 +--- a/test/network_tests/payload_tests/payload_test_client.hpp ++++ b/test/network_tests/payload_tests/payload_test_client.hpp +@@ -15,6 +15,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/payload_tests/payload_test_service.hpp b/test/network_tests/payload_tests/payload_test_service.hpp +index 7d3c01d5..06dbb684 100644 +--- a/test/network_tests/payload_tests/payload_test_service.hpp ++++ b/test/network_tests/payload_tests/payload_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp +index 8a7c9e70..6a758318 100644 +--- a/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp ++++ b/test/network_tests/restart_routing_tests/restart_routing_test_client.hpp +@@ -19,6 +19,7 @@ + #include <condition_variable> + #include <atomic> + #include <future> ++#include <iomanip> + + class routing_restart_test_client { + public: +diff --git a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp +index 7660b8fc..1fe4d86c 100644 +--- a/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp ++++ b/test/network_tests/restart_routing_tests/restart_routing_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class routing_restart_test_service { + public: +diff --git a/test/network_tests/routing_tests/external_local_routing_test_service.hpp b/test/network_tests/routing_tests/external_local_routing_test_service.hpp +index 2499bc84..b1e2dfd8 100644 +--- a/test/network_tests/routing_tests/external_local_routing_test_service.hpp ++++ b/test/network_tests/routing_tests/external_local_routing_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/routing_tests/local_routing_test_client.hpp b/test/network_tests/routing_tests/local_routing_test_client.hpp +index 09af0bf0..69ee6bfc 100644 +--- a/test/network_tests/routing_tests/local_routing_test_client.hpp ++++ b/test/network_tests/routing_tests/local_routing_test_client.hpp +@@ -14,6 +14,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/routing_tests/local_routing_test_service.hpp b/test/network_tests/routing_tests/local_routing_test_service.hpp +index 109dade4..932423d8 100644 +--- a/test/network_tests/routing_tests/local_routing_test_service.hpp ++++ b/test/network_tests/routing_tests/local_routing_test_service.hpp +@@ -13,6 +13,7 @@ + #include <mutex> + #include <condition_variable> + #include <functional> ++#include <iomanip> + + #include "../someip_test_globals.hpp" + #include <common/vsomeip_app_utilities.hpp> +diff --git a/test/network_tests/second_address_tests/second_address_test_service.cpp b/test/network_tests/second_address_tests/second_address_test_service.cpp +index fc9d0a28..3ffa493f 100644 +--- a/test/network_tests/second_address_tests/second_address_test_service.cpp ++++ b/test/network_tests/second_address_tests/second_address_test_service.cpp +@@ -9,6 +9,7 @@ + #include <sstream> + #include <thread> + #include <map> ++#include <iomanip> + + #include <gtest/gtest.h> + #include <vsomeip/vsomeip.hpp> +diff --git a/test/network_tests/security_tests/security_test_client.hpp b/test/network_tests/security_tests/security_test_client.hpp +index ab3d98b8..bd331138 100644 +--- a/test/network_tests/security_tests/security_test_client.hpp ++++ b/test/network_tests/security_tests/security_test_client.hpp +@@ -18,6 +18,7 @@ + #include <mutex> + #include <condition_variable> + #include <atomic> ++#include <iomanip> + + class security_test_client { + public: +diff --git a/test/network_tests/security_tests/security_test_service.hpp b/test/network_tests/security_tests/security_test_service.hpp +index 87fb94fd..1f227072 100644 +--- a/test/network_tests/security_tests/security_test_service.hpp ++++ b/test/network_tests/security_tests/security_test_service.hpp +@@ -16,6 +16,7 @@ + #include <thread> + #include <mutex> + #include <condition_variable> ++#include <iomanip> + + class security_test_service { + public: +diff --git a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp +index 6f099ce7..dc9df239 100644 +--- a/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp ++++ b/test/network_tests/suspend_resume_tests/suspend_resume_test_service.cpp +@@ -7,6 +7,7 @@ + #include <mutex> + #include <thread> + #include <atomic> ++#include <iomanip> + + #include <gtest/gtest.h> + diff --git a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb index 4c38970205..36fa196a5f 100644 --- a/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb +++ b/meta-openembedded/meta-networking/recipes-protocols/vsomeip/vsomeip_3.4.10.bb @@ -13,6 +13,8 @@ SRC_URI = "git://github.com/GENIVI/${BPN}.git;branch=master;protocol=https;name= file://0003-Do-not-build-external-gtest.patch \ file://0004-Do-not-specify-PIE-flag-explicitly.patch \ file://0005-test-common-CMakeLists.txt-add-missing-link-with-dlt.patch \ + file://0001-Update-to-C-17-560.patch \ + file://0002-network_tests-Include-iomanip-system-header.patch \ " SRCREV = "02c199dff8aba814beebe3ca417fd991058fe90c" diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch new file mode 100644 index 0000000000..1712a53462 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp/0002-fix-invalid-conversion-from-int-to-CURLoption.patch @@ -0,0 +1,36 @@ +From ebe9144fdfdc8154661b93322cec4a1c43aa75ff Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Tue, 1 Oct 2024 19:45:38 +0300 +Subject: [PATCH] Fix invalid conversion from int to CURLoption + +Options.hpp:281:74: error: invalid conversion from 'int' to 'CURLoption' [-fpermissive] + 281 | typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; + | ^ + | | + | int + +Fix invalid conversion by adding explicit cast to CURLoption + +Upstream-Status: Pending + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + include/curlpp/Options.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/curlpp/Options.hpp b/include/curlpp/Options.hpp +index c705c9d..7c9a501 100644 +--- a/include/curlpp/Options.hpp ++++ b/include/curlpp/Options.hpp +@@ -278,7 +278,7 @@ namespace options + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_LIMIT> LowSpeedLimit; + typedef curlpp::OptionTrait<long, CURLOPT_LOW_SPEED_TIME> LowSpeedTime; + typedef curlpp::OptionTrait<long, CURLOPT_MAXCONNECTS> MaxConnects; +- typedef curlpp::OptionTrait<curl_closepolicy, CURLOPT_CLOSEPOLICY> ClosePolicy; ++ typedef curlpp::OptionTrait<curl_closepolicy, (CURLoption)CURLOPT_CLOSEPOLICY> ClosePolicy; + typedef curlpp::OptionTrait<bool, CURLOPT_FRESH_CONNECT> FreshConnect; + typedef curlpp::OptionTrait<bool, CURLOPT_FORBID_REUSE> ForbidReuse; + typedef curlpp::OptionTrait<long, CURLOPT_CONNECTTIMEOUT> ConnectTimeout; +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb index 131f1873a2..cacdc9773b 100644 --- a/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/curlpp/curlpp_0.8.1.bb @@ -8,7 +8,8 @@ DEPENDS = "curl" DEPENDS:class-native = "curl-native" SRC_URI = "git://github.com/jpbarrette/curlpp.git;branch=master;protocol=https \ - file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch" + file://0001-curlpp-config.in-Remove-references-to-absolute-build.patch \ + file://0002-fix-invalid-conversion-from-int-to-CURLoption.patch" SRCREV = "592552a165cc569dac7674cb7fc9de3dc829906f" diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb index be74759d5e..ba783d03ff 100644 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb +++ b/meta-openembedded/meta-networking/recipes-support/dnsmasq/dnsmasq_2.90.bb @@ -12,7 +12,6 @@ DEPENDS += "gettext-native" #at least versions 2.69 and prior are moved to the archive folder on the server SRC_URI = "http://www.thekelleys.org.uk/dnsmasq/${@['archive/', ''][float(d.getVar('PV').split('.')[1]) > 69]}dnsmasq-${PV}.tar.gz \ file://init \ - file://dnsmasq.conf \ file://dnsmasq-resolvconf.service \ file://dnsmasq-noresolvconf.service \ file://dnsmasq-resolved.conf \ @@ -25,8 +24,13 @@ INITSCRIPT_NAME = "dnsmasq" INITSCRIPT_PARAMS = "defaults" # dnsmasq defaults -PACKAGECONFIG ?= "auth dhcp dhcp6 dumpfile inotify ipset loop script tftp" +PACKAGECONFIG ?= "\ + auth dhcp dumpfile inotify ipset loop script tftp \ + ${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'dhcp6', '', d)} \ + ${@bb.utils.contains('MACHINE_FEATURES', 'rtc', '', 'broken-rtc', d)} \ +" +# see src/config.h PACKAGECONFIG[auth] = "-DHAVE_AUTH,-DNO_AUTH" PACKAGECONFIG[broken-rtc] = "-DHAVE_BROKEN_RTC," PACKAGECONFIG[conntrack] = "-DHAVE_CONNTRACK,,libnetfilter-conntrack" @@ -81,7 +85,7 @@ do_install () { "MANDIR=${D}${mandir}" \ install-i18n install -d ${D}${sysconfdir}/ ${D}${sysconfdir}/init.d ${D}${sysconfdir}/dnsmasq.d - install -m 644 ${UNPACKDIR}/dnsmasq.conf ${D}${sysconfdir}/ + install -m 644 ${S}/dnsmasq.conf.example ${D}${sysconfdir}/dnsmasq.conf install -m 755 ${UNPACKDIR}/init ${D}${sysconfdir}/init.d/dnsmasq install -d ${D}${systemd_unitdir}/system diff --git a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf b/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf deleted file mode 100755 index 2897b90300..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/dnsmasq/files/dnsmasq.conf +++ /dev/null @@ -1,298 +0,0 @@ -# Configuration file for dnsmasq. -# -# Format is one option per line, legal options are the same -# as the long options legal on the command line. See -# "/usr/bin/dnsmasq --help" or "man 8 dnsmasq" for details. - -# Listen on this specific port instead of the standard DNS port -# (53). Setting this to zero completely disables DNS function, -# leaving only DHCP and/or TFTP. -#port=5353 - -# Change these lines if you want dnsmasq to serve MX records. -# Only one of mx-host and mx-target need be set, the other defaults -# to the name of the host running dnsmasq. -#mx-host= -#mx-target= -#selfmx -#localmx - -# The following two options make you a better netizen, since they -# tell dnsmasq to filter out queries which the public DNS cannot -# answer, and which load the servers (especially the root servers) -# uneccessarily. If you have a dial-on-demand link they also stop -# these requests from bringing up the link uneccessarily. - -# Never forward plain names (with a dot or domain part) -domain-needed -# Never forward addresses in the non-routed address spaces. -bogus-priv - - -# Uncomment this to filter useless windows-originated DNS requests -# which can trigger dial-on-demand links needlessly. -# Note that (amongst other things) this blocks all SRV requests, -# so don't use it if you use eg Kerberos. -#filterwin2k - -# Change this line if you want dns to get its upstream servers from -# somewhere other that /etc/resolv.conf -#resolv-file= - -# By default, dnsmasq will send queries to any of the upstream -# servers it knows about and tries to favour servers to are known -# to be up. Uncommenting this forces dnsmasq to try each query -# with each server strictly in the order they appear in -# /etc/resolv.conf -#strict-order - -# If you don't want dnsmasq to read /etc/resolv.conf or any other -# file, getting its servers for this file instead (see below), then -# uncomment this -#no-resolv - -# If you don't want dnsmasq to poll /etc/resolv.conf or other resolv -# files for changes and re-read them then uncomment this. -#no-poll - -# Add other name servers here, with domain specs if they are for -# non-public domains. -#server=/localnet/192.168.0.1 - -# Add local-only domains here, queries in these domains are answered -# from /etc/hosts or DHCP only. -#local=/localnet/ - -# Add domains which you want to force to an IP address here. -# The example below send any host in doubleclick.net to a local -# webserver. -#address=/doubleclick.net/127.0.0.1 - -# You no longer (as of version 1.7) need to set these to enable -# dnsmasq to read /etc/ppp/resolv.conf since dnsmasq now uses the -# "dip" group to achieve this. -#user= -#group= - -# If you want dnsmasq to listen for requests only on specified interfaces -# (and the loopback) give the name of the interface (eg eth0) here. -# Repeat the line for more than one interface. -#interface= -# Or you can specify which interface _not_ to listen on -#except-interface= -# Or which to listen on by address (remember to include 127.0.0.1 if -# you use this.) -#listen-address=127.0.0.1 - -# On systems which support it, dnsmasq binds the wildcard address, -# even when it is listening on only some interfaces. It then discards -# requests that it shouldn't reply to. This has the advantage of -# working even when interfaces come and go and change address. If you -# want dnsmasq to really bind only the interfaces it is listening on, -# uncomment this option. About the only time you may need this is when -# running another nameserver on the same machine. -#bind-interfaces - -# If you don't want dnsmasq to read /etc/hosts, uncomment the -# following line. -#no-hosts -# or if you want it to read another file, as well as /etc/hosts, use -# this. -#addn-hosts=/etc/banner_add_hosts - -# Set this (and domain: see below) if you want to have a domain -# automatically added to simple names in a hosts-file. -#expand-hosts - -# Set the domain for dnsmasq. this is optional, but if it is set, it -# does the following things. -# 1) Allows DHCP hosts to have fully qualified domain names, as long -# as the domain part matches this setting. -# 2) Sets the "domain" DHCP option thereby potentially setting the -# domain of all systems configured by DHCP -# 3) Provides the domain part for "expand-hosts" -#domain=thekelleys.org.uk - -# Uncomment this to enable the integrated DHCP server, you need -# to supply the range of addresses available for lease and optionally -# a lease time. If you have more than one network, you will need to -# repeat this for each network on which you want to supply DHCP -# service. -#dhcp-range=192.168.0.50,192.168.0.150,12h -#dhcp-range=10.0.0.10,10.0.0.200,2h - -# This is an example of a DHCP range where the netmask is given. This -# is needed for networks we reach the dnsmasq DHCP server via a relay -# agent. If you don't know what a DHCP relay agent is, you probably -# don't need to worry about this. -#dhcp-range=192.168.0.50,192.168.0.150,255.255.255.0,12h - -# This is an example of a DHCP range with a network-id, so that -# some DHCP options may be set only for this network. -#dhcp-range=red,192.168.0.50,192.168.0.150 - -# Supply parameters for specified hosts using DHCP. There are lots -# of valid alternatives, so we will give examples of each. Note that -# IP addresses DO NOT have to be in the range given above, they just -# need to be on the same network. The order of the parameters in these -# do not matter, it's permissble to give name,adddress and MAC in any order - -# Always allocate the host with ethernet address 11:22:33:44:55:66 -# The IP address 192.168.0.60 -#dhcp-host=11:22:33:44:55:66,192.168.0.60 - -# Always set the name of the host with hardware address -# 11:22:33:44:55:66 to be "fred" -#dhcp-host=11:22:33:44:55:66,fred - -# Always give the host with ethernet address 11:22:33:44:55:66 -# the name fred and IP address 192.168.0.60 and lease time 45 minutes -#dhcp-host=11:22:33:44:55:66,fred,192.168.0.60,45m - -# Give the machine which says it's name is "bert" IP address -# 192.168.0.70 and an infinite lease -#dhcp-host=bert,192.168.0.70,infinite - -# Always give the host with client identifier 01:02:02:04 -# the IP address 192.168.0.60 -#dhcp-host=id:01:02:02:04,192.168.0.60 - -# Always give the host with client identifier "marjorie" -# the IP address 192.168.0.60 -#dhcp-host=id:marjorie,192.168.0.60 - -# Enable the address given for "judge" in /etc/hosts -# to be given to a machine presenting the name "judge" when -# it asks for a DHCP lease. -#dhcp-host=judge - -# Never offer DHCP service to a machine whose ethernet -# address is 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,ignore - -# Ignore any client-id presented by the machine with ethernet -# address 11:22:33:44:55:66. This is useful to prevent a machine -# being treated differently when running under different OS's or -# between PXE boot and OS boot. -#dhcp-host=11:22:33:44:55:66,id:* - -# Send extra options which are tagged as "red" to -# the machine with ethernet address 11:22:33:44:55:66 -#dhcp-host=11:22:33:44:55:66,net:red - -# Send extra options which are tagged as "red" to any machine whose -# DHCP vendorclass string includes the substring "Linux" -#dhcp-vendorclass=red,Linux - -# Send extra options which are tagged as "red" to any machine one -# of whose DHCP userclass strings includes the substring "accounts" -#dhcp-userclass=red,accounts - -# If this line is uncommented, dnsmasq will read /etc/ethers and act -# on the ethernet-address/IP pairs found there just as if they had -# been given as --dhcp-host options. Useful if you keep -# MAC-address/host mappings there for other purposes. -#read-ethers - -# Send options to hosts which ask for a DHCP lease. -# See RFC 2132 for details of available options. -# Note that all the common settings, such as netmask and -# broadcast address, DNS server and default route, are given -# sane defaults by dnsmasq. You very likely will not need any -# any dhcp-options. If you use Windows clients and Samba, there -# are some options which are recommended, they are detailed at the -# end of this section. -# For reference, the common options are: -# subnet mask - 1 -# default router - 3 -# DNS server - 6 -# broadcast address - 28 - -# Set the NTP time server addresses to 192.168.0.4 and 10.10.0.5 -#dhcp-option=42,192.168.0.4,10.10.0.5 - -# Set the NTP time server address to be the same machine as -# is running dnsmasq -#dhcp-option=42,0.0.0.0 - -# Set the NIS domain name to "welly" -#dhcp-option=40,welly - -# Set the default time-to-live to 50 -#dhcp-option=23,50 - -# Set the "all subnets are local" flag -#dhcp-option=27,1 - -# Send the etherboot magic flag and then etherboot options (a string). -#dhcp-option=128,e4:45:74:68:00:00 -#dhcp-option=129,NIC=eepro100 - -# Specify an option which will only be sent to the "red" network -# (see dhcp-range for the declaration of the "red" network) -#dhcp-option=red,42,192.168.1.1 - -# The following DHCP options set up dnsmasq in the same way as is specified -# for the ISC dhcpcd in -# http://www.samba.org/samba/ftp/docs/textdocs/DHCP-Server-Configuration.txt -# adapted for a typical dnsmasq installation where the host running -# dnsmasq is also the host running samba. -# you may want to uncomment them if you use Windows clients and Samba. -#dhcp-option=19,0 # option ip-forwarding off -#dhcp-option=44,0.0.0.0 # set netbios-over-TCP/IP nameserver(s) aka WINS server(s) -#dhcp-option=45,0.0.0.0 # netbios datagram distribution server -#dhcp-option=46,8 # netbios node type -#dhcp-option=47 # empty netbios scope. - - -# Set the boot filename and tftpd server name and address -# for BOOTP. You will only need this is you want to -# boot machines over the network. -#dhcp-boot=/var/ftpd/pxelinux.0,boothost,192.168.0.3 - -# Set the limit on DHCP leases, the default is 150 -#dhcp-lease-max=150 - -# The DHCP server needs somewhere on disk to keep its lease database. -# This defaults to a sane location, but if you want to change it, use -# the line below. -#dhcp-leasefile=/var/lib/misc/dnsmasq.leases - -# Set the cachesize here. -#cache-size=150 - -# If you want to disable negative caching, uncomment this. -#no-negcache - -# Normally responses which come form /etc/hosts and the DHCP lease -# file have Time-To-Live set as zero, which conventionally means -# do not cache further. If you are happy to trade lower load on the -# server for potentially stale date, you can set a time-to-live (in -# seconds) here. -#local-ttl= - -# If you want dnsmasq to detect attempts by Verisign to send queries -# to unregistered .com and .net hosts to its sitefinder service and -# have dnsmasq instead return the correct NXDOMAIN response, uncomment -# this line. You can add similar lines to do the same for other -# registries which have implemented wildcard A records. -#bogus-nxdomain=64.94.110.11 - -# If you want to fix up DNS results from upstream servers, use the -# alias option. This only works for IPv4. -# This alias makes a result of 1.2.3.4 appear as 5.6.7.8 -#alias=1.2.3.4,5.6.7.8 -# and this maps 1.2.3.x to 5.6.7.x -#alias=1.2.3.0,5.6.7.0,255.255.255.0 - -# For debugging purposes, log each DNS query as it passes through -# dnsmasq. -#log-queries - -# Include a another lot of configuration options. -#conf-file=/etc/dnsmasq.more.conf - - - - - diff --git a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb index 2f887e6018..4e76d24526 100644 --- a/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb +++ b/meta-openembedded/meta-networking/recipes-support/dovecot/dovecot_2.3.21.bb @@ -50,7 +50,8 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append () { rm -rf ${D}${libdir}/dovecot/dovecot-config install -d 755 ${D}/etc/dovecot - touch 644 ${D}/etc/dovecot/dovecot.conf + touch ${D}/etc/dovecot/dovecot.conf + chmod 644 ${D}/etc/dovecot/dovecot.conf if [ "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" ]; then install -m 0644 ${UNPACKDIR}/dovecot.service ${D}${systemd_unitdir}/system sed -i -e 's#@SYSCONFDIR@#${sysconfdir}#g' ${D}${systemd_unitdir}/system/dovecot.service diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch deleted file mode 100644 index b98e1e70c7..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 61991db099f66348dddbc3408e7ee8c05bda85cb Mon Sep 17 00:00:00 2001 -From: Yoann Congal <yoann.congal@smile.fr> -Date: Sat, 2 Mar 2024 16:23:07 +0100 -Subject: [PATCH] configure.ac: Add an option to disable host udev version - checks - -In cross-compilation environment, the build host might have an outdated -udev or no udev at all. But the user may still want to build with the -enabled udev rule (for its udev-enabled target). - -This patch adds a "--disable-udevchecks" option the disable build host -udev version check at configure-time and unconditionally install the -enabled udev rule. Without this new option, the behavior stays the same -(checks enabled). - -Signed-off-by: Yoann Congal <yoann.congal@smile.fr> -Upstream-Status: Backport [https://github.com/LINBIT/drbd-utils/commit/f2b5a7335ae52109dfb95a9d99ae20519c43d59a] ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f1d69ea3..4c56d33b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -71,6 +71,11 @@ AC_ARG_WITH([udev], - [AS_HELP_STRING([--with-udev], - [Enable udev integration])], - [WITH_UDEV=$withval]) -+AC_ARG_ENABLE([udevchecks], -+ [AS_HELP_STRING([--disable-udevchecks], -+ [Disable host udev version checks])], -+ [], -+ [enable_udevchecks=yes]) - AC_ARG_WITH([xen], - [AS_HELP_STRING([--with-xen], - [Enable Xen integration])], -@@ -315,7 +320,7 @@ if test -z $GIT; then - AC_MSG_WARN(Cannot update buildtag without git. You may safely ignore this warning when building from a tarball.) - fi - --if test $UDEVADM = false && test $UDEVINFO = false; then -+if test "x$enable_udevchecks" != "xno" && test $UDEVADM = false && test $UDEVINFO = false; then - if test "$WITH_UDEV" = "yes"; then - AC_MSG_WARN([udev support enabled, but neither udevadm nor udevinfo found on this system.]) - fi -@@ -423,7 +428,7 @@ else - test -z $INITDIR && INITDIR="$sysconfdir/init.d" - - dnl Our udev rules file is known to work only with udev >= 85 -- if test "$WITH_UDEV" = "yes"; then -+ if test "x$enable_udevchecks" != "xno" && test "$WITH_UDEV" = "yes"; then - udev_version=$( set -- $($UDEVADM version); echo $1 ) - if test -z "$udev_version"; then - udev_version=$( set -- $($UDEVINFO -V); echo $3 ) diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch index 27f0a9b54a..ef0229d5bb 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils/0001-drbd-utils-support-usrmerge.patch @@ -1,4 +1,4 @@ -From 264ae7b062ac52a5545a8a562b51001f7ce7369d Mon Sep 17 00:00:00 2001 +From 9109f15f5b8ae142823194b9ef50c392615fe38d Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Thu, 21 Apr 2022 17:22:35 +0800 Subject: [PATCH] drbd-utils: support usermerge @@ -16,15 +16,14 @@ Signed-off-by: Sakib Sajal <sakib.sajal@windriver.com> scripts/drbd.service | 6 +++--- scripts/drbd@.service | 6 +++--- scripts/ocf.ra@.service | 4 ++-- - user/v83/Makefile.in | 14 +++++++------- user/v84/Makefile.in | 14 +++++++------- - 10 files changed, 32 insertions(+), 32 deletions(-) + 9 files changed, 25 insertions(+), 25 deletions(-) diff --git a/configure.ac b/configure.ac -index f1d69ea3..3289ac7d 100644 +index d3ec5ff1..910232b1 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,7 +183,7 @@ AC_ARG_WITH(tmpfilesdir, +@@ -178,7 +178,7 @@ AC_ARG_WITH(tmpfilesdir, AC_SUBST(tmpfilesdir) # set default early @@ -34,10 +33,10 @@ index f1d69ea3..3289ac7d 100644 test x"$with_udev" = xyes ; then if test x"$PKG_CONFIG" != x; then diff --git a/scripts/Makefile.in b/scripts/Makefile.in -index aca15a22..a1cd2ffe 100644 +index 15a26f37..ff028310 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in -@@ -91,11 +91,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) +@@ -90,11 +90,11 @@ ifeq ($(subst both,systemd,$(initscripttype)),systemd) install -d $(DESTDIR)$(systemdunitdir) install -m 644 $(SYSTEMD_UNITS) $(DESTDIR)$(systemdunitdir)/ install -m 644 $(SYSTEMD_TEMPLATES) $(DESTDIR)$(systemdunitdir)/ @@ -137,37 +136,6 @@ index 9c2268a6..1666c482 100644 -ExecStopPost=/lib/drbd/scripts/ocf.ra.wrapper.sh stop %n +ExecStart=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh start-and-monitor %n +ExecStopPost=@nonarch_libdir@/drbd/scripts/ocf.ra.wrapper.sh stop %n -diff --git a/user/v83/Makefile.in b/user/v83/Makefile.in -index 08cfe574..4c4971b6 100644 ---- a/user/v83/Makefile.in -+++ b/user/v83/Makefile.in -@@ -96,19 +96,19 @@ install: - ifeq ($(WITH_83_SUPPORT),yes) - install -d $(DESTDIR)$(localstatedir)/lib/drbd - install -d $(DESTDIR)$(localstatedir)/lock -- install -d $(DESTDIR)/lib/drbd/ -+ install -d $(DESTDIR)/${nonarch_libdir}/drbd/ - if getent group haclient > /dev/null 2> /dev/null ; then \ -- install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -g haclient -m 4750 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - else \ -- install -m 755 drbdsetup-83 $(DESTDIR)/lib/drbd/ ; \ -- install -m 755 drbdadm-83 $(DESTDIR)/lib/drbd/ ; \ -+ install -m 755 drbdsetup-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ -+ install -m 755 drbdadm-83 $(DESTDIR)/${nonarch_libdir}/drbd/ ; \ - fi - endif - - uninstall: -- rm -f $(DESTDIR)/lib/drbd/drbdsetup-83 -- rm -f $(DESTDIR)/lib/drbd/drbdadm-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdsetup-83 -+ rm -f $(DESTDIR)/${nonarch_libdir}/drbd/drbdadm-83 - - .PHONY: install uninstall clean distclean - ../../configure: diff --git a/user/v84/Makefile.in b/user/v84/Makefile.in index 0fcefc5f..81f7d5ec 100644 --- a/user/v84/Makefile.in @@ -199,3 +167,6 @@ index 0fcefc5f..81f7d5ec 100644 spell: for f in drbdadm_adjust.c drbdadm_main.c drbdadm_parser.c drbdadm_usage_cnt.c drbdsetup.c drbdtool_common.c; do \ +-- +2.25.1 + diff --git a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb index 63f0fd18c1..af0afc2a91 100644 --- a/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.27.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/drbd/drbd-utils_9.28.0.bb @@ -11,9 +11,8 @@ SRC_URI = "git://github.com/LINBIT/drbd-utils;name=drbd-utils;branch=master;prot git://github.com/LINBIT/drbd-headers;name=drbd-headers;destsuffix=git/drbd-headers;branch=master;protocol=https \ file://0001-drbdmon-add-LDFLAGS-when-linking.patch \ ${@bb.utils.contains('DISTRO_FEATURES','usrmerge','file://0001-drbd-utils-support-usrmerge.patch','',d)} \ - file://0001-configure.ac-Add-an-option-to-disable-host-udev-vers.patch \ " -SRCREV_drbd-utils = "fdd9a4d603a9dc99d110d8bd0e288d7c0b6f586e" +SRCREV_drbd-utils = "ba2ce9037989b6141222c7901d1219cf852949f1" SRCREV_drbd-headers = "0349f00825b4198d4ec3248f43884114a187676a" SRCREV_FORMAT = "drbd-utils_drbd-headers" diff --git a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb index 6cde94b202..cc23d5a34e 100644 --- a/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb +++ b/meta-openembedded/meta-networking/recipes-support/fetchmail/fetchmail_6.4.38.bb @@ -16,13 +16,10 @@ SRC_URI[sha256sum] = "a6cb4ea863ac61d242ffb2db564a39123761578d3e40d71ce7b6f2905b inherit autotools gettext pkgconfig python3-dir python3native -EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix}" - -INSANE_SKIP:${PN} = "already-stripped" +EXTRA_OECONF = "--with-ssl=${STAGING_DIR_HOST}${prefix} --disable-rpath " do_install:append() { sed -i 's,${RECIPE_SYSROOT_NATIVE},,g' ${D}${bindir}/fetchmailconf - sed -i 's,${RECIPE_SYSROOT},,g' ${D}${bindir}/fetchmail } PACKAGES =+ "fetchmail-python" diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch deleted file mode 100644 index e696ac4ead..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5aea816f27a71e6c88ad50e7326fa6584eeb7ad9 Mon Sep 17 00:00:00 2001 -From: Francois Marier <francois@debian.org> -Date: Fri, 24 Jul 2020 21:22:47 -0700 -Subject: [PATCH] Fix compilation with GCC's -fno-common flag (fixes #305) - -Upstream-Status: Submitted [https://github.com/mrash/fwknop/pull/319] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - client/log_msg.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/log_msg.h b/client/log_msg.h -index cc17716..3dda161 100644 ---- a/client/log_msg.h -+++ b/client/log_msg.h -@@ -38,7 +38,7 @@ enum - LOG_VERBOSITY_INFO, /*!< Constant to define a INFO message */ - LOG_VERBOSITY_DEBUG, /*!< Constant to define a DEBUG message */ - LOG_LAST_VERBOSITY --} log_level_t; -+}; - - #define LOG_DEFAULT_VERBOSITY LOG_VERBOSITY_NORMAL /*!< Default verbosity to use */ - --- -2.28.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch deleted file mode 100644 index f3e1707408..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop/0001-configure.ac-Fix-missing-comma-in-AS_IF.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fee4cb0ae2d1fcd012cb7f501c3db0d8ec910798 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 2 Apr 2023 10:01:51 -0700 -Subject: [PATCH] configure.ac: Fix missing comma in AS_IF - -this is flagged with autconf 2.72 - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 47a069e..9cdfd3f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -744,7 +744,7 @@ dnl - IPFW_EXE="" - IPTABLES_EXE="" - FIREWALLD_EXE="" -- ] -+ ], - ] - ] - ] --- -2.40.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb index a1f56cdf16..7cc044d996 100644 --- a/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/fwknop/fwknop_2.6.11.bb @@ -1,20 +1,20 @@ SUMMARY = "fwknop - Single Packet Authorization" HOMEPAGE = "http://www.cipherdyne.org/fwknop/" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - " +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + inherit autotools-brokensep pkgconfig SRC_URI = "http://www.cipherdyne.org/${BPN}/download/${BPN}-${PV}.tar.bz2 \ - file://0001-Fix-compilation-with-GCC-s-fno-common-flag-fixes-305.patch \ file://0001-Use-pkg-config-to-find-gpgme.patch \ - file://0001-configure.ac-Fix-missing-comma-in-AS_IF.patch \ " -SRC_URI[sha256sum] = "f6c09bec97ed8e474a98ae14f9f53e1bcdda33393f20667b6af3fb6bb894ca77" +SRC_URI[sha256sum] = "a4ec7c22dd90dd684f9f7b96d3a901c4131ec8c7a3b9db26d0428513f6774c64" DEPENDS = "libpcap gpgme" -EXTRA_OECONF = " --with-iptables=${sbindir}/iptables" +EXTRA_OECONF = "--with-iptables=${sbindir}/iptables \ + --with-gpg=${bindir}/gpg \ + --with-wget=${base_bindir}/wget" do_configure:prepend () { install -m 0755 ${STAGING_DATADIR_NATIVE}/gnu-config/config.guess ${S}/config diff --git a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb deleted file mode 100644 index b8d0536eb3..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/libconfuse/libconfuse_3.3.bb +++ /dev/null @@ -1,14 +0,0 @@ -DESCRIPTION = "libConfuse is a configuration file parser library" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" - -SRCREV = "a42aebf13db33afd575da6e63f55163d371f776d" -SRC_URI = "git://github.com/libconfuse/libconfuse.git;branch=master;protocol=https" - -inherit autotools-brokensep pkgconfig gettext - -S = "${WORKDIR}/git" - -do_configure:prepend(){ - (cd ${S} && ${S}/autogen.sh) -} diff --git a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb index bdd87993d7..29ff2cf6f2 100644 --- a/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/libldb/libldb_2.8.1.bb @@ -34,7 +34,7 @@ LIC_FILES_CHKSUM = "file://pyldb.h;endline=24;md5=dfbd238cecad76957f7f860fbe9ada file://man/ldb.3.xml;beginline=261;endline=262;md5=137f9fd61040c1505d1aa1019663fd08 \ file://tools/ldbdump.c;endline=19;md5=a7d4fc5d1f75676b49df491575a86a42" -SRC_URI[sha256sum] = "358dca10fcd27207ac857a0d7f435a46dbc6cd1f7c10dbb840c1931bf1965f08" +SRC_URI[sha256sum] = "b68ce6eb0ccd2870fa3c8c334f2028b5d16606fd41308696c17b71959f7bf59f" inherit pkgconfig waf-samba ptest diff --git a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb index bd3f9f63a9..a96527a3e6 100644 --- a/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/libtdb/libtdb_1.4.12.bb @@ -15,7 +15,7 @@ SRC_URI = "https://samba.org/ftp/tdb/tdb-${PV}.tar.gz \ file://run-ptest \ " -SRC_URI[sha256sum] = "02338e33c16c21c9e29571cef523e76b2b708636254f6f30c6cf195d48c62daf" +SRC_URI[sha256sum] = "6ce4b27498812d09237ece65a0d6dfac0941610e709848ecb822aa241084cd7a" PACKAGECONFIG ??= "\ ${@bb.utils.filter('DISTRO_FEATURES', 'acl', d)} \ diff --git a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb index 86b9112ba2..391e0e4ab6 100644 --- a/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb +++ b/meta-openembedded/meta-networking/recipes-support/linux-atm/linux-atm_2.5.2.bb @@ -32,3 +32,7 @@ inherit autotools pkgconfig EXTRA_OEMAKE += "ROOTPREFIX=${root_prefix}" FILES:${PN} += "${nonarch_base_libdir}/firmware" + +# http://errors.yoctoproject.org/Errors/Details/766901/ +# linux-atm-2.5.2/src/led/conn.c:414:57: error: passing argument 3 of 'accept' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb index 0243f2a1db..a5f9c5543f 100644 --- a/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.19.bb +++ b/meta-openembedded/meta-networking/recipes-support/lksctp-tools/lksctp-tools_1.0.20.bb @@ -8,10 +8,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING;md5=0c56db0143f4f80c369ee3af7425af6e \ " -SRCREV = "05b50d379ff0037de4957bb2a1befcce88b70225" - -PV .= "+git" -LK_REL = "1.0.19" +SRCREV = "311fcdeb5cb41612d4be66b16f0f2ad6675a6af8" SRC_URI = " \ git://github.com/sctp/lksctp-tools.git;branch=master;protocol=https \ @@ -34,19 +31,14 @@ do_install_ptest () { done } -SOLIBVERSION="${LK_REL}" -SOLIBMAJORVERSION="1" - PACKAGES =+ "${PN}-withsctp ${PN}-utils" FILES:${PN} = " \ - ${libdir}/libsctp.so.${SOLIBVERSION} \ - ${libdir}/libsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/libsctp.so.* \ " FILES:${PN}-withsctp = " \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBVERSION} \ - ${libdir}/lksctp-tools/libwithsctp.so.${SOLIBMAJORVERSION} \ + ${libdir}/lksctp-tools/libwithsctp.so.* \ " FILES:${PN}-dev += " \ diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch new file mode 100644 index 0000000000..7bfb17bf08 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6/0001-Remove-use-of-variables-indicating-buildtime-informa.patch @@ -0,0 +1,85 @@ +From 7b3e78cf0348ea737609a2ace07c7c55aae36bcb Mon Sep 17 00:00:00 2001 +From: Santiago Vila <sanvila@debian.org> +Date: Wed, 9 Oct 2024 22:05:09 -0700 +Subject: [PATCH] Remove use of variables indicating buildtime information + +We should not really care about the build date or the build host + +Sourced From: https://salsa.debian.org/debian/ndisc6/-/blob/master/debian/patches/reproducible-build.patch?ref_type=heads + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + rdnss/rdnssd.c | 2 -- + src/addrinfo.c | 2 -- + src/ndisc.c | 2 -- + src/tcpspray.c | 2 -- + src/traceroute.c | 2 -- + 5 files changed, 10 deletions(-) + +diff --git a/rdnss/rdnssd.c b/rdnss/rdnssd.c +index b87edb2..7201525 100644 +--- a/rdnss/rdnssd.c ++++ b/rdnss/rdnssd.c +@@ -741,8 +741,6 @@ version (void) + { + printf (_("rdnssd: IPv6 Recursive DNS Server discovery Daemon %s (%s)\n"), + VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Pierre Ynard and Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Pierre Ynard, Remi Denis-Courmont\n"), +diff --git a/src/addrinfo.c b/src/addrinfo.c +index cd73722..6316abd 100644 +--- a/src/addrinfo.c ++++ b/src/addrinfo.c +@@ -148,8 +148,6 @@ static int quick_usage (const char *path) + static int version (void) + { + printf (_("addrinfo %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2002, 2007); +diff --git a/src/ndisc.c b/src/ndisc.c +index b190b18..6e222a0 100644 +--- a/src/ndisc.c ++++ b/src/ndisc.c +@@ -920,9 +920,7 @@ version (void) + { + printf (_( + "ndisc6: IPv6 Neighbor/Router Discovery userland tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); + +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2004, 2007); +diff --git a/src/tcpspray.c b/src/tcpspray.c +index 39d8939..6347795 100644 +--- a/src/tcpspray.c ++++ b/src/tcpspray.c +@@ -302,8 +302,6 @@ version (void) + { + printf (_( + "tcpspray6: TCP/IP bandwidth tester %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); +diff --git a/src/traceroute.c b/src/traceroute.c +index 489bc55..604b6af 100644 +--- a/src/traceroute.c ++++ b/src/traceroute.c +@@ -1251,8 +1251,6 @@ version (void) + { + printf (_( + "traceroute6: TCP & UDP IPv6 traceroute tool %s (%s)\n"), VERSION, "$Rev$"); +- printf (_(" built %s on %s\n"), __DATE__, PACKAGE_BUILD_HOSTNAME); +- printf (_("Configured with: %s\n"), PACKAGE_CONFIGURE_INVOCATION); + puts (_("Written by Remi Denis-Courmont\n")); + + printf (_("Copyright (C) %u-%u Remi Denis-Courmont\n"), 2005, 2007); diff --git a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb index a827e7f42a..21579d64c1 100644 --- a/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb +++ b/meta-openembedded/meta-networking/recipes-support/ndisc6/ndisc6_1.0.8.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SRCREV = "92e5d1cf6547fe40316b2a6ca2f7b8195ae0cbe5" SRC_URI = "git://git.remlab.net/git/ndisc6.git;protocol=http;branch=master \ file://0001-autogen-Do-not-symlink-gettext.h-from-build-host.patch \ + file://0001-Remove-use-of-variables-indicating-buildtime-informa.patch \ " S = "${WORKDIR}/git" @@ -27,6 +28,10 @@ do_configure:prepend() { ${S}/autogen.sh } +do_configure:append() { + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${B}/config.h +} + do_install:append () { rm -rf ${D}${localstatedir} # Enable SUID bit for applications that need it diff --git a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd index d1b9c49076..a0c43ed5e5 100755 --- a/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd +++ b/meta-openembedded/meta-networking/recipes-support/ntp/ntp/ntpd @@ -72,7 +72,7 @@ case "$1" in startdaemon ;; status) - status /usr/sbin/ntpd; + status ntpd; exit $? ;; *) diff --git a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb index 7e3fe5601f..217829193f 100644 --- a/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.3.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/open-vm-tools/open-vm-tools_12.4.5.bb @@ -25,7 +25,7 @@ LICENSE:modules/freebsd/vmxnet = "GPL-2.0-only" LICENSE:modules/linux = "GPL-2.0-only" LICENSE:modules/solaris = "CDDL-1.0" -SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.3.x \ +SRC_URI = "git://github.com/vmware/open-vm-tools.git;protocol=https;branch=stable-12.4.x \ file://tools.conf \ file://vmtoolsd.service \ file://vmtoolsd.init \ @@ -50,7 +50,7 @@ UPSTREAM_CHECK_GITTAGREGEX = "stable-(?P<pver>\d+(\.\d+)+)" SRC_URI:append:libc-musl = " file://0001-Add-resolv_compat.h-for-musl-builds.patch;patchdir=.. \ " -SRCREV = "1b362b9eb449fb5de3809aaea4a636ece30ee5b7" +SRCREV = "9b94132f54fbed0b86dce04ff4402d1d8fd059c3" S = "${WORKDIR}/git/open-vm-tools" @@ -64,7 +64,7 @@ inherit autotools pkgconfig systemd update-rc.d SYSTEMD_SERVICE:${PN} = "vmtoolsd.service" EXTRA_OECONF = "--without-icu --disable-multimon --disable-docs \ - --disable-tests --without-gtkmm --without-xerces --without-pam \ + --disable-tests --without-gtkmm --without-pam \ --disable-vgauth --disable-deploypkg --disable-containerinfo \ --without-root-privileges --without-kernel-modules --with-tirpc \ --with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" diff --git a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb index c7c7573677..74c5ef220d 100644 --- a/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.35.bb +++ b/meta-openembedded/meta-networking/recipes-support/openipmi/openipmi_2.0.36.bb @@ -34,7 +34,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/openipmi/OpenIPMI-${PV}.tar.gz \ S = "${WORKDIR}/OpenIPMI-${PV}" -SRC_URI[sha256sum] = "b059114f6299d73f04ff6e76a0857a0ab81aa362dee99644d256b223872437ad" +SRC_URI[sha256sum] = "a0403148fa5f7bed930c958a4d1c558047e273763a408b3a0368edc137cc55d9" inherit autotools-brokensep pkgconfig perlnative update-rc.d systemd cpan-base python3targetconfig diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch index 03b454d625..e1253db1ec 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn/0001-configure.ac-eliminate-build-path-from-openvpn-versi.patch @@ -1,4 +1,4 @@ -From ea179d83b0aa62719d90748cd1fb260f40055f15 Mon Sep 17 00:00:00 2001 +From 9cc13bdcb71cd16d2873637c491e07c01de9a3ea Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Mon, 13 Jun 2022 22:44:28 +0800 Subject: [PATCH] configure.ac: eliminate build path from openvpn --version @@ -31,10 +31,10 @@ Signed-off-by: Yi Zhao <yi.zhao@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 2f5f6bc..eddcbc5 100644 +index df16c43..623ca65 100644 --- a/configure.ac +++ b/configure.ac -@@ -1377,7 +1377,7 @@ if test "${enable_async_push}" = "yes"; then +@@ -1463,7 +1463,7 @@ if test "${enable_async_push}" = "yes"; then esac fi @@ -43,6 +43,3 @@ index 2f5f6bc..eddcbc5 100644 AC_DEFINE_UNQUOTED([CONFIGURE_DEFINES], ["`echo ${CONFIGURE_DEFINES}`"], [Configuration settings]) TAP_WIN_COMPONENT_ID="PRODUCT_TAP_WIN_COMPONENT_ID" --- -2.25.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb index ba53d40f47..d81b8ce449 100644 --- a/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.10.bb +++ b/meta-openembedded/meta-networking/recipes-support/openvpn/openvpn_2.6.12.bb @@ -14,7 +14,7 @@ SRC_URI = "http://swupdate.openvpn.org/community/releases/${BP}.tar.gz \ UPSTREAM_CHECK_URI = "https://openvpn.net/community-downloads" -SRC_URI[sha256sum] = "1993bbb7b9edb430626eaa24573f881fd3df642f427fcb824b1aed1fca1bcc9b" +SRC_URI[sha256sum] = "1c610fddeb686e34f1367c347e027e418e07523a10f4d8ce4a2c2af2f61a1929" CVE_STATUS[CVE-2020-27569] = "not-applicable-config: Applies only Aviatrix OpenVPN client, not openvpn" diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch new file mode 100644 index 0000000000..092f4431bf --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core/0001-librdmacm-Use-overloadable-function-attribute-with-c.patch @@ -0,0 +1,38 @@ +From c7de6834f0cd92b7341ab17a5c6996f3fbd40140 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 21 Jun 2024 22:16:47 -0700 +Subject: [PATCH] librdmacm: Use overloadable function attribute with clang + + This is to fix build warnings seen with upcoming clang19 and + glibc 2.40, since glibc 2.40 has improved fortyfying this + function with clang, it ends up with build errors like below + +librdmacm/preload.c:796:9: error: at most one overload for a given name may lack the 'overloadable' attribute +| 796 | ssize_t recvfrom(int socket, void *buf, size_t len, int flags, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/rdma-core/51.0/recipe-sysroot/usr/include/sys/socket.h:163:16: note: previous unmarked overload of function is here +| 163 | extern ssize_t recvfrom (int __fd, void *__restrict __buf, size_t __n, +| | ^ + +Upstream-Status: Submitted [https://github.com/linux-rdma/rdma-core/pull/1475] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + librdmacm/preload.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/librdmacm/preload.c ++++ b/librdmacm/preload.c +@@ -792,8 +792,11 @@ ssize_t recv(int socket, void *buf, size + return (fd_fork_get(socket, &fd) == fd_rsocket) ? + rrecv(fd, buf, len, flags) : real.recv(fd, buf, len, flags); + } +- +-ssize_t recvfrom(int socket, void *buf, size_t len, int flags, ++ssize_t ++#if defined(__clang__) && defined(__GLIBC__) ++__attribute__((overloadable)) ++#endif ++recvfrom(int socket, void *buf, size_t len, int flags, + struct sockaddr *src_addr, socklen_t *addrlen) + { + int fd; diff --git a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb index 7c26a8c436..0c204c109f 100644 --- a/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/rdma-core/rdma-core_51.0.bb @@ -8,6 +8,7 @@ RDEPENDS:${PN} = "bash perl" SRC_URI = "git://github.com/linux-rdma/rdma-core.git;branch=master;protocol=https \ file://0001-cmake-Allow-SYSTEMCTL_BIN-to-be-overridden-from-envi.patch \ file://0001-include-libgen.h-for-basename.patch \ + file://0001-librdmacm-Use-overloadable-function-attribute-with-c.patch \ " SRCREV = "6cd09097ad2eebde9a7fa3d3bb09a2cea6e3c2d6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb index 50248078a2..518ca9e277 100644 --- a/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/sngrep/sngrep_1.8.2.bb @@ -16,7 +16,7 @@ DEPENDS = "\ " SRC_URI = "git://github.com/irontec/sngrep.git;protocol=https;branch=master" -SRCREV = "373abb90804ba71f980c7120e62f90d3a5c81213" +SRCREV = "dad1033640f249fa4994f976cf6ee96826c15702" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb index 0531ffe640..2d63119750 100644 --- a/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb +++ b/meta-openembedded/meta-networking/recipes-support/ssmping/ssmping_0.9.1.bb @@ -15,3 +15,7 @@ CFLAGS += "-D_GNU_SOURCE " do_install() { oe_runmake 'DESTDIR=${D}' 'PREFIX=${prefix}' install } + +# http://errors.yoctoproject.org/Errors/Details/766895/ +# ssmping.c:55:51: error: passing argument 3 of 'getsockname' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch index 82d3551019..8c4ca55fbb 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel/fix-openssl-no-des.patch @@ -1,4 +1,4 @@ -From 7ff4eba20b5c4fc7365e5ee0dfb775ed29bdd5ce Mon Sep 17 00:00:00 2001 +From c815368a3e41dd3f639eb8fd82d21bc0bab55d1e Mon Sep 17 00:00:00 2001 From: Kai Kang <kai.kang@windriver.com> Date: Wed, 1 Nov 2017 09:23:41 -0400 Subject: [PATCH] stunnel: fix compile error when openssl disable des support @@ -17,10 +17,10 @@ Signed-off-by: Kai Kang <kai.kang@windriver.com> 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/common.h b/src/common.h -index 2b4869f..180d31a 100644 +index f112cf9..8d4be01 100644 --- a/src/common.h +++ b/src/common.h -@@ -492,7 +492,9 @@ extern char *sys_errlist[]; +@@ -496,7 +496,9 @@ extern char *sys_errlist[]; #ifndef OPENSSL_NO_MD4 #include <openssl/md4.h> #endif /* !defined(OPENSSL_NO_MD4) */ @@ -31,19 +31,19 @@ index 2b4869f..180d31a 100644 #include <openssl/dh.h> #if OPENSSL_VERSION_NUMBER<0x10100000L diff --git a/src/protocol.c b/src/protocol.c -index cfe6d3b..3936aea 100644 +index c8c65ea..b071b06 100644 --- a/src/protocol.c +++ b/src/protocol.c -@@ -81,7 +81,7 @@ NOEXPORT void ldap_client_middle(CLI *); - +@@ -82,7 +82,7 @@ NOEXPORT void ldap_client_middle(CLI *); NOEXPORT void connect_server_early(CLI *); + NOEXPORT const char *connect_client_init(SERVICE_OPTIONS *); NOEXPORT void connect_client_middle(CLI *); -#ifndef OPENSSL_NO_MD4 +#if !defined(OPENSSL_NO_MD4) && !defined(OPENSSL_NO_DES) NOEXPORT void ntlm(CLI *); NOEXPORT char *ntlm1(void); NOEXPORT char *ntlm3(char *, char *, char *, char *); -@@ -1331,7 +1331,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1334,7 +1334,7 @@ NOEXPORT void connect_client_middle(CLI *c) { fd_printf(c, c->remote_fd.fd, "Host: %s", c->opt->protocol_host); if(c->opt->protocol_username && c->opt->protocol_password) { if(!strcasecmp(c->opt->protocol_authentication, "ntlm")) { @@ -52,7 +52,7 @@ index cfe6d3b..3936aea 100644 ntlm(c); #else s_log(LOG_ERR, "NTLM authentication is not available"); -@@ -1374,7 +1374,7 @@ NOEXPORT void connect_client_middle(CLI *c) { +@@ -1377,7 +1377,7 @@ NOEXPORT void connect_client_middle(CLI *c) { str_free(line); } @@ -61,6 +61,3 @@ index cfe6d3b..3936aea 100644 /* * NTLM code is based on the following documentation: --- -2.34.1 - diff --git a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb index 6d21027a16..e13b7871ca 100644 --- a/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.72.bb +++ b/meta-openembedded/meta-networking/recipes-support/stunnel/stunnel_5.73.bb @@ -11,7 +11,7 @@ SRC_URI = "https://stunnel.org/archive/5.x/${BP}.tar.gz \ file://fix-openssl-no-des.patch \ " -SRC_URI[sha256sum] = "3d532941281ae353319735144e4adb9ae489a10b7e309c58a48157f08f42e949" +SRC_URI[sha256sum] = "bc917c3bcd943a4d632360c067977a31e85e385f5f4845f69749bce88183cb38" inherit autotools bash-completion pkgconfig diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest index 2bfb2267da..2bfb2267da 100755..100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump/run-ptest diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb index 803a9bb5f5..32b869f241 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpdump_4.99.5.bb @@ -21,12 +21,12 @@ RDEPENDS:${PN}-ptest += " make perl \ " SRC_URI = " \ - http://www.tcpdump.org/release/${BP}.tar.gz \ + http://www.tcpdump.org/release/${BP}.tar.xz \ file://add-ptest.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "0232231bb2f29d6bf2426e70a08a7e0c63a0d59a9b44863b7f5e2357a6e49fea" +SRC_URI[sha256sum] = "d76395ab82d659d526291b013eee200201380930793531515abfc6e77b4f2ee5" UPSTREAM_CHECK_REGEX = "tcpdump-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb index 93197dc3bc..3d61160bb0 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.7.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpdump/tcpslice_1.8.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://tcpslice.c;endline=20;md5=99519e2e5234d1662a4ce16baa6 SRC_URI = "http://www.tcpdump.org/release/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "e513f0710c4ab45ec627e5df6f7b80d12e488146e1bd500c92247e20ca608903" +SRC_URI[sha256sum] = "082967d6bf793499d3d655cea2149e07c0da97287f1877a6eab88d17cb703d0d" UPSTREAM_CHECK_REGEX = "tcpslice-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch deleted file mode 100644 index 08cb3b88fa..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 42f7bbc1ce4913fe2c0bc76293c5445d31690f5d Mon Sep 17 00:00:00 2001 -From: Chen Qi <Qi.Chen@windriver.com> -Date: Thu, 7 Mar 2024 21:02:07 -0800 -Subject: [PATCH] configure.ac: do not run conftest in case of cross - compilation - -It'll give us nothing but error like below: - - ./conftest: cannot execute binary file: Exec format error - ... - ./configure: line 23950: test: -eq: unary operator expected - -The version check only has effect on Apple systems. We'd better -avoid error like above when cross compilation. - -Also, in case of cross compilation, instead of having the above -Exec format error and resulting in unaligned_cv_fail to yes, set -it directly to yes. - -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/849] - -Signed-off-by: Chen Qi <Qi.Chen@windriver.com> ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..15201601 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -928,7 +928,7 @@ cat >conftest.c <<EOF - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LPCAPLIB \ - conftest.c $LIBS >/dev/null 2>&1 --if test -x conftest ; then -+if test -x conftest -a "$cross_compiling" != "yes"; then - full_libpcap_version=$(LD_LIBRARY_PATH="$LPCAP_LD_LIBRARY_PATH" ./conftest) - libpcap_version=$(echo "$full_libpcap_version" | ${CUT} -d' ' -f3) - pcap_version_ok=yes -@@ -1709,7 +1709,7 @@ case "$host_os" in - EOF - ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS \ - conftest.c $LIBS >/dev/null 2>&1 -- if test ! -x conftest ; then -+ if test ! -x conftest -o "$cross_compiling" = "yes" ; then - dnl failed to compile for some reason - unaligned_cv_fail=yes - else --- -2.42.0 - diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch deleted file mode 100644 index 709d2cccbc..0000000000 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay/0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 5f8c78362b3b1e06f5adff2d4b140509c4799894 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sun, 3 Sep 2023 12:31:59 +0200 -Subject: [PATCH] configure.ac: unify search dirs for pcap and add lib32 - -* add lib32 because when building lib32-tcpreplay it's - impossible to set --with-libpcap so that it would find - both include files as well as the library in lib32 directory - -* maybe it would be beneficial to split --with-libpcap - into --with-libpcap-includedir --with-libpcap-libdir as this - already searches in the --with-libpcap value with and - without any "lib" prefix, but include files always expect - "include" dir there - -* most of this code was added in: - https://github.com/appneta/tcpreplay/commit/202b8e82f9fd3c84ce5804577caeb36a33baabe7#diff-49473dca262eeab3b4a43002adb08b4db31020d190caaad1594b47f1d5daa810R570 - -* then search for - ${host_cpu} lib/${host_cpu} (without -${host_os} suffix) - and ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was added, but only for search of dynamic library in: - https://github.com/appneta/tcpreplay/commit/c3d5236563985a99f8bb02c3f1bd6950e3929047 - -* ${build_arch}-${host_os} lib/${build_arch}-${host_os} - was later replaced with: - lib/${MULTIARCH} ${MULTIARCH} - and it was added to static library search as well - - but for dynamic library it was searching in reversed order: - ${MULTIARCH} lib/${MULTIARCH} - https://github.com/appneta/tcpreplay/commit/ed9e3a818bde04813144014561e62f018c9eb85f - - I don't think this reversed order was intentional, just unify all 4 cases - to use the same directories in the same order - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> -Upstream-Status: Submitted [https://github.com/appneta/tcpreplay/pull/819] ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 387219de..26ba31a5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -671,7 +671,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR=${testdir} - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls ${testdir}/$dir/libpcap${ext}* 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAP_LD_LIBRARY_PATH="$(dirname ${sharefile})" -@@ -690,7 +690,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls ${testdir}/$dir/libpcap${ext} 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" -@@ -771,7 +771,7 @@ AC_ARG_WITH(libpcap, - LPCAPINCDIR="${testdir}/include" - if test $dynamic_link = yes; then - for ext in .dylib .so .tbd; do -- for dir in . lib lib64 ${host_cpu} lib/${host_cpu} ${host_cpu}-${host_os} lib/${host_cpu}-${host_os} ${MULTIARCH} lib/${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - sharefile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${sharefile}"; then - LPCAPLIB="-L$(dirname ${sharefile}) -lpcap" -@@ -790,7 +790,7 @@ AC_ARG_WITH(libpcap, - dnl If dynamic library not found, try static - dnl - for ext in ${libext} .a .A.tbd ; do -- for dir in . lib lib64 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do -+ for dir in . lib lib64 lib32 lib/${host_cpu}-${host_os} ${host_cpu}-${host_os} lib/${MULTIARCH} ${MULTIARCH}; do - staticfile=$(ls "${testdir}/$dir/libpcap${ext}" 2> /dev/null | sort | head -n1) - if test -n "${staticfile}"; then - LPCAPLIB="${staticfile}" diff --git a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb index 26de40a65a..f01bbb95a5 100644 --- a/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.4.4.bb +++ b/meta-openembedded/meta-networking/recipes-support/tcpreplay/tcpreplay_4.5.1.bb @@ -9,11 +9,9 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE;md5=10f0474a2f0e5dccfca20f69d6598ad8" SRC_URI = "https://github.com/appneta/${BPN}/releases/download/v${PV}/${BP}.tar.gz \ file://0001-libopts.m4-set-POSIX_SHELL-to-bin-sh.patch \ - file://0001-configure.ac-unify-search-dirs-for-pcap-and-add-lib3.patch \ - file://0001-configure.ac-do-not-run-conftest-in-case-of-cross-co.patch \ " -SRC_URI[sha256sum] = "44f18fb6d3470ecaf77a51b901a119dae16da5be4d4140ffbb2785e37ad6d4bf" +SRC_URI[sha256sum] = "2de79bfd67ec92ca9ae2ffb50456dd1d53ff40f3fa71b422c65e8062013c9e85" UPSTREAM_CHECK_URI = "https://github.com/appneta/tcpreplay/releases" diff --git a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb index 862cba91e9..b72c375400 100644 --- a/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/traceroute/traceroute_2.1.6.bb @@ -17,7 +17,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/traceroute/files/tracerou SRC_URI = "${SOURCEFORGE_MIRROR}/traceroute/traceroute/${BP}/${BP}.tar.gz \ " -SRC_URI[sha256sum] = "9c6c260d96eaab51e3ce461b0a84fe87123ebc6dd6c9a59fab803f95b35a859e" +SRC_URI[sha256sum] = "9ccef9cdb9d7a98ff7fbf93f79ebd0e48881664b525c4b232a0fcec7dcb9db5e" EXTRA_OEMAKE = "VPATH=${STAGING_LIBDIR}" LTOEXTRA += "-flto-partition=none" diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest new file mode 100644 index 0000000000..433a687c65 --- /dev/null +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound/run-ptest @@ -0,0 +1,17 @@ +#!/bin/sh + +cd tests || exit 1 +retVal=0 +./unittest +./testbound -s +for x in ./testdata/*.rpl; do + output="$(./testbound -p $x -o -vvvvv 2>&1)" + if test $? -eq 0; then + echo "$x :Pass" + else + echo "$output" + echo "$x :Fail" + retVal=1 + fi +done +exit $retVal diff --git a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb index fe0111f595..8c042dc5f4 100644 --- a/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.20.0.bb +++ b/meta-openembedded/meta-networking/recipes-support/unbound/unbound_1.21.0.bb @@ -9,10 +9,12 @@ SECTION = "net" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5308494bc0590c0cb036afd781d78f06" -SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=branch-1.20.0" -SRCREV = "b9525c5fd47ba481a29b90109017d2253beb105d" +SRC_URI = "git://github.com/NLnetLabs/unbound.git;protocol=https;branch=master \ + file://run-ptest \ + " +SRCREV = "79e4c578518886a32475cfbb0de383ff3a905033" -inherit autotools pkgconfig systemd update-rc.d +inherit autotools pkgconfig systemd update-rc.d ptest DEPENDS = "openssl libtool-native bison-native expat" RDEPENDS:${PN} = "bash openssl-bin daemonize" @@ -32,6 +34,10 @@ do_configure:append() { sed -i -e 's#${RECIPE_SYSROOT}##g' ${B}/config.h } +do_compile:append() { + oe_runmake tests +} + do_install:append() { install -d ${D}${systemd_unitdir}/system install -m 0644 ${B}/contrib/unbound.service ${D}${systemd_unitdir}/system @@ -40,6 +46,19 @@ do_install:append() { install -m 0755 ${S}/contrib/unbound.init_yocto ${D}${sysconfdir}/init.d/unbound } +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + install -d ${D}${PTEST_PATH}/tests/testdata + + install -m 0544 ${B}/unittest ${D}${PTEST_PATH}/tests/ + install -m 0544 ${B}/testbound ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_signatures* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_sigs* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_ds* ${D}${PTEST_PATH}/tests/ + install -m 0664 ${S}/testdata/test_nsec3_hash* ${D}${PTEST_PATH}/tests/ + install -m 0644 ${S}/testdata/*.rpl ${D}/${PTEST_PATH}/tests/testdata/ +} + SYSTEMD_SERVICE:${PN} = "${BPN}.service" INITSCRIPT_NAME = "unbound" diff --git a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb index 9da43cf9f4..c3de38a6f8 100644 --- a/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wavemon/wavemon_0.9.6.bb @@ -14,7 +14,7 @@ PACKAGECONFIG[cap] = "--with-libcap,--without-libcap,libcap" DEPENDS = "libnl ncurses" SRC_URI = "git://github.com/uoaerg/wavemon;branch=master;protocol=https" -SRCREV = "a7c2f190e010db508ead31fa952478e2a1c13d64" +SRCREV = "8ba6604027c0aa5131070e3fafdcda323d58a7ad" # Needs some help to find libnl3 headers. # Reorder -pthread flag on the command line. diff --git a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb index 7cbe3e6324..3fa293d0cd 100644 --- a/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.5.bb +++ b/meta-openembedded/meta-networking/recipes-support/wireshark/wireshark_4.2.7.bb @@ -17,7 +17,7 @@ SRC_URI = "https://1.eu.dl.wireshark.org/src/wireshark-${PV}.tar.xz \ UPSTREAM_CHECK_URI = "https://1.as.dl.wireshark.org/src" -SRC_URI[sha256sum] = "55e793ab87a9a73aac44336235c92cb76c52180c469b362ed3a54f26fbb1261f" +SRC_URI[sha256sum] = "2c5de08e19081bd666a2ce3f052c023274d06acaabc5d667a3c3051a9c618f86" PE = "1" @@ -42,7 +42,7 @@ PACKAGECONFIG[plugins] = "-DENABLE_PLUGINS=ON,-DENABLE_PLUGINS=OFF" PACKAGECONFIG[sbc] = "-DENABLE_SBC=ON,-DENABLE_SBC=OFF, sbc" PACKAGECONFIG[libssh] = "-DENABLE_LIBSSH=ON,-DENABLE_LIBSSH=OFF, libssh2" PACKAGECONFIG[lz4] = "-DENABLE_LZ4=ON,-DENABLE_LZ4=OFF, lz4" -PACKAGECONFIG[zstd] = "-DENABLE_STTD=ON,-DENABLE_ZSTD=OFF, zstd" +PACKAGECONFIG[zstd] = "-DENABLE_ZSTD=ON,-DENABLE_ZSTD=OFF, zstd" PACKAGECONFIG[nghttp2] = "-DENABLE_NGHTTP2=ON,-DENABLE_NGHTTP2=OFF, nghttp2" # these next two options require addional layers diff --git a/meta-openembedded/meta-oe/README.md b/meta-openembedded/meta-oe/README.md index 676a2c8925..a4c98a7978 100644 --- a/meta-openembedded/meta-oe/README.md +++ b/meta-openembedded/meta-oe/README.md @@ -4,7 +4,7 @@ meta-oe This layer depends on: URI: git://github.com/openembedded/openembedded-core.git -branch: master +branch: styhead luajit recipe requires host compiler to be able to generate 32bit code when target is 32bit e.g. arm, so ensure that $CC -m32 is functional on build host, if building this recipe, needed @@ -16,16 +16,21 @@ pacman -S lib32-gcc-libs lib32-glibc Ubuntu sudo apt-get install gcc-multilib linux-libc-dev:i386 -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-oe][styhead]' in the subject' When sending single patches, please use something like: -'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][PATCH"' +'git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix="meta-oe][styhead][PATCH"' You are encouraged to fork the mirror on GitHub https://github.com/openembedded/meta-openembedded to share your patches, this is preferred for patch sets consisting of more than one patch. +Note, it is discouraged to send patches via GitHub pull request system. Such +patches get less attention from developers and can be mishandled or not +reviewed properly. Please use emails instead. For exemple, you can use +'git request-pull' to generate an email referencing your git repository. + Other services like GitLab, repo.or.cz or self-hosted setups are of course accepted as well, 'git fetch <remote>' works the same on all of them. We recommend GitHub because it is free, easy to use, has been proven to be reliable and has a really good web GUI. -layer maintainer: Khem Raj <raj.khem@gmail.com> +layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index eaa86c411b..0ea43f5972 100644 --- a/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-openembedded/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -17,7 +17,6 @@ PTESTS_FAST_META_OE = "\ jq \ leveldb \ libcereal \ - libee \ libgpiod \ libio-pty-perl \ libmanette \ @@ -34,6 +33,7 @@ PTESTS_FAST_META_OE = "\ nodejs \ onig \ oprofile \ + pegtl \ protobuf \ pv \ python3-pefile \ diff --git a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb index ac197a631e..98184b2236 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/gnome-layer/recipes-graphics/openbox/openbox-xdgmenu_0.3.bb @@ -16,6 +16,7 @@ SRC_URI = " \ file://fix-menu-generation.patch \ " SRC_URI[sha256sum] = "824e099928aab2fb628f0fa4870ef7bba10b95581e47c2d8fa216709a0f399b3" +UPSTREAM_CHECK_URI="https://launchpad.net/openbox-xdgmenu/" inherit pkgconfig features_check # depends on openbox, which is X11-only diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch index 663a80ecde..663a80ecde 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0002-meson.build-do-not-use-Werror.patch +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-do-not-use-Werror.patch diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch deleted file mode 100644 index 4f385e917a..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-meson.build-drop-unnecessary-build-dependencies.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d3aa30f5cd7ba375e006a755752acbcfcd619452 Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Wed, 6 Mar 2024 19:27:15 +0800 -Subject: [PATCH] meson.build: drop unnecessary build dependencies - -The pytest and pycoverage are required by meson test but not for -building. Mark them as 'required: false' to get rid of unnecessary -build dependencies. - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - meson.build | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 9556836a..30f33fe2 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,8 +25,8 @@ bash_completions_dir = completions.get_variable(pkgconfig: 'completionsdir', def - # Order: Fedora/Mageia/openSUSE || Debian/Ubuntu - pyflakes = find_program('pyflakes-3', 'pyflakes3', required: false) - pycodestyle = find_program('pycodestyle-3', 'pycodestyle', 'pep8', required: false) --pytest = find_program('pytest-3', 'pytest3') # also requires the pytest-cov plugin --pycoverage = find_program('coverage-3', 'python3-coverage') -+pytest = find_program('pytest-3', 'pytest3', required: false) # also requires the pytest-cov plugin -+pycoverage = find_program('coverage-3', 'python3-coverage', required: false) - pandoc = find_program('pandoc', required: false) - find = find_program('find') - -@@ -75,6 +75,7 @@ if get_option('unit_testing') - endif - - #FIXME: exclude doc/env/ -+if pyflakes.found() and pycodestyle.found() - test('linting', - pyflakes, - timeout: 100, -@@ -91,7 +92,9 @@ test('legacy-tests', - find_program('tests/cli_legacy.py'), - timeout: 600, - env: test_env) -+endif - #TODO: split out dbus tests into own test() instance, to run in parallel -+if pycoverage.found() - test('unit-tests', - pycoverage, - args: ['run', '-a', '-m', 'pytest', '-s', '-v', '--cov-append', meson.current_source_dir()], -@@ -143,4 +146,5 @@ if get_option('b_coverage') - priority: -99, # run last - is_parallel: false) - endif -+endif - --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch deleted file mode 100644 index 9f01108a20..0000000000 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan/0001-networkd.c-define-scope-specific-to-case-statement.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6e3dd61bf90a7ca8c36c5b95943cbff7c1ad3c2d Mon Sep 17 00:00:00 2001 -From: Yi Zhao <yi.zhao@windriver.com> -Date: Wed, 6 Mar 2024 16:12:31 +0800 -Subject: [PATCH] networkd.c: define scope specific to case statement - -Per [1], define a scope specific to case statement to fix build with -clang. - -Fixes: -../git/src/networkd.c:544:13: error: expected expression - 544 | gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - | ^ -../git/src/networkd.c:545:17: error: use of undeclared identifier 'first' - 545 | if (first != def->id) { - | ^ - -[1] https://stackoverflow.com/questions/92396/why-cant-variables-be-declared-in-a-switch-statement - -Upstream-Status: Pending - -Signed-off-by: Yi Zhao <yi.zhao@windriver.com> ---- - src/networkd.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/networkd.c b/src/networkd.c -index 25121c48..5eb9c0fe 100644 ---- a/src/networkd.c -+++ b/src/networkd.c -@@ -541,12 +541,14 @@ write_netdev_file(const NetplanNetDefinition* def, const char* rootdir, const ch - * and, if the selected name is the name of the netdef being written, we generate - * the .netdev file. Otherwise we skip the netdef. - */ -+ { - gchar* first = g_strcmp0(def->id, def->veth_peer_link->id) < 0 ? def->id : def->veth_peer_link->id; - if (first != def->id) { - g_string_free(s, TRUE); - return; - } - g_string_append_printf(s, "Kind=veth\n\n[Peer]\nName=%s\n", def->veth_peer_link->id); -+ } - break; - - case NETPLAN_DEF_TYPE_TUNNEL: --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb index 229414718c..40d72caa0e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/netplan/netplan_1.1.bb @@ -15,14 +15,12 @@ inherit meson pkgconfig systemd python3targetconfig features_check REQUIRED_DISTRO_FEATURES = "systemd" SRC_URI = "git://github.com/CanonicalLtd/netplan.git;branch=main;protocol=https \ - file://0001-meson.build-drop-unnecessary-build-dependencies.patch \ - file://0002-meson.build-do-not-use-Werror.patch \ + file://0001-meson.build-do-not-use-Werror.patch \ " SRC_URI:append:libc-musl = " file://0001-don-t-fail-if-GLOB_BRACE-is-not-defined.patch" -SRC_URI:append:toolchain-clang = " file://0001-networkd.c-define-scope-specific-to-case-statement.patch" -SRCREV = "45f7cd1569896d9e316c130bf5c60b7ccfc8211d" +SRCREV = "d27f32305f7f06de449b32239a89969e6ff2be31" S = "${WORKDIR}/git" @@ -30,10 +28,11 @@ DEPENDS = "glib-2.0 libyaml util-linux-libuuid \ systemd python3-cffi-native \ " -EXTRA_OEMESON = "-Dunit_testing=false" +EXTRA_OEMESON = "-Dtesting=false -Dunit_testing=false" RDEPENDS:${PN} = "python3-core python3-netifaces python3-pyyaml \ python3-dbus python3-rich python3-cffi \ + python3-json python3-fcntl \ util-linux-libuuid libnetplan \ " diff --git a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb index 2c749eeba7..7f2859186e 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/meta-python/recipes-connectivity/thingsboard-gateway/thingsboard-gateway_3.5.1.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://thingsboard.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -SRC_URI[sha256sum] = "6505d94d3173e2469950b03d5b99dac4210af7b659a3a1a3b58da35b2a984da6" +SRC_URI[sha256sum] = "3d4ae3026b76be94aef67eba7d7e3a64e436ba9556d74ad142ba8988e4e4b253" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb index cb2ff672e3..b98c70db77 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools-conf_1.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://android-gadget-setup" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install() { install -d ${D}${bindir} install -m 0755 ${UNPACKDIR}/android-gadget-setup ${D}${bindir} diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74e..b6661f2e39 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service] diff --git a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb index 456c7400ef..d2680b4578 100644 --- a/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb +++ b/meta-openembedded/meta-oe/dynamic-layers/selinux/recipes-devtool/android-tools/android-tools_29.0.6.r14.bb @@ -68,6 +68,7 @@ COMPATIBLE_HOST:powerpc64le = "(null)" inherit systemd +SYSTEMD_PACKAGES = "${PN}-adbd" SYSTEMD_SERVICE:${PN}-adbd = "android-tools-adbd.service" # Find libbsd headers during native builds @@ -189,7 +190,7 @@ FILES:${PN} += "${libdir}/android ${libdir}/android/*" BBCLASSEXTEND = "native" android_tools_enable_devmode() { - touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled + touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled } ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb index 5d27acbdc0..db4377f53e 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/dhrystone/dhrystone_2.1.bb @@ -27,3 +27,27 @@ CFLAGS += "-fno-lto" CFLAGS:append:toolchain-clang = " -Wno-error=implicit-function-declaration -Wno-error=deprecated-non-prototype -Wno-error=implicit-int" LDFLAGS += "-fno-lto" + +# http://errors.yoctoproject.org/Errors/Details/766887/ +# dhry_1.c:101:3: error: implicit declaration of function 'strcpy' [-Wimplicit-function-declaration] +# dhry_1.c:149:5: error: implicit declaration of function 'Proc_5' [-Wimplicit-function-declaration] +# dhry_1.c:150:5: error: implicit declaration of function 'Proc_4' [-Wimplicit-function-declaration] +# dhry_1.c:156:19: error: implicit declaration of function 'Func_2'; did you mean 'Func_1'? [-Wimplicit-function-declaration] +# dhry_1.c:162:7: error: implicit declaration of function 'Proc_7' [-Wimplicit-function-declaration] +# dhry_1.c:167:5: error: implicit declaration of function 'Proc_8' [-Wimplicit-function-declaration] +# dhry_1.c:169:5: error: implicit declaration of function 'Proc_1' [-Wimplicit-function-declaration] +# dhry_1.c:176:9: error: implicit declaration of function 'Proc_6' [-Wimplicit-function-declaration] +# dhry_1.c:187:5: error: implicit declaration of function 'Proc_2' [-Wimplicit-function-declaration] +# dhry_1.c:287:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:303:3: error: implicit declaration of function 'Proc_3'; did you mean 'Proc_1'? [-Wimplicit-function-declaration] +# dhry_1.c:321:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:344:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:359:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:371:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_1.c:73:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:164:9: error: implicit declaration of function 'strcmp' [-Wimplicit-function-declaration] +# dhry_2.c:30:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:39:9: error: implicit declaration of function 'Func_3' [-Wimplicit-function-declaration] +# dhry_2.c:64:1: error: return type defaults to 'int' [-Wimplicit-int] +# dhry_2.c:84:1: error: return type defaults to 'int' [-Wimplicit-int] +CFLAGS += "-Wno-error=implicit-int -Wno-error=implicit-function-declaration" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index 4ace4515ad..df76067a44 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -13,6 +13,9 @@ SRC_URI = "git://git.musl-libc.org/libc-bench;branch=master \ file://0001-build-Do-not-override-ldflags-from-environment.patch \ " +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_install () { diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch deleted file mode 100644 index 0787ef27d2..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch +++ /dev/null @@ -1,210 +0,0 @@ -From 0a163f60b4a316c4b6f1726a71c84755f3bd85e7 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <martin.jansa@lge.com> -Date: Wed, 16 Sep 2020 04:36:04 -0700 -Subject: [PATCH] Revert "ld.hugetlbfs: fix -Ttext-segment argument on AArch64" - -This reverts commit 852dcc963ce44861ed7c4e225aa92ff2b5b43579. - -* works around - ERROR: libhugetlbfs-1_2.23-r0 do_populate_sysroot: Fatal errors occurred in subprocesses: - Command '['arm-oe-linux-gnueabi-strip', '--remove-section=.comment', '--remove-section=.note', 'libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw']' returned non-zero exit status 1. - Subprocess output:arm-oe-linux-gnueabi-strip: - libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58: error: PHDR segment not covered by LOAD segment - arm-oe-linux-gnueabi-strip: libhugetlbfs/1_2.23-r0/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/stmuFa58[.interp]: file format not recognized - -I don't see anything suspicious in the build (the same cmdline as in 2.22 -version), but it uses - -libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc - -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 --Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security --Werror=format-security -Werror=return-type ---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot --I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c -libhugetlbfs/1_2.22-r0-old/temp/log.do_compile:arm-oe-linux-gnueabi-gcc - -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 --Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security --Werror=format-security -Werror=return-type ---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.22-r0/recipe-sysroot --B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl --lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o -obj32/testutils.o -libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc - -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 --Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security --Werror=format-security -Werror=return-type ---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot --I.. -O2 -Wall -g -o obj32/linkhuge_rw.o -c linkhuge_rw.c -libhugetlbfs/1_2.23-r0-new/temp/log.do_compile:arm-oe-linux-gnueabi-gcc - -mthumb -mfpu=neon-vfpv4 -mfloat-abi=hard -mcpu=cortex-a7 -Wl,-O1 --Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --fstack-protector-strong -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security --Werror=format-security -Werror=return-type ---sysroot=/jenkins/mjansa/build/ros/oe-melodic-gatesgarth/libhugetlbfs/1_2.23-r0/recipe-sysroot --B./obj32 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Wl,-z,relro,-z,now --ldl -L../obj32 -o obj32/linkhuge_rw -Wl,--no-as-needed -lpthread -ldl --lhugetlbfs_privutils -Wl,--hugetlbfs-align obj32/linkhuge_rw.o -obj32/testutils.o - -And the git log between 2.22 and 2.23 is also very short and looks -reasonable. -https://github.com/libhugetlbfs/libhugetlbfs/compare/2.22...2.23 - -When checking with readelf -l it also shows the error about PHDR segment: -arm-oe-linux-gnueabi-readelf -l -./1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw - -Elf file type is DYN (Shared object file) -Entry point 0x201105 -There are 10 program headers, starting at offset 52 - -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 - INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 - [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] - LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 - LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 - DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 - NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 - GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 - EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 - GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 - - Section to Segment mapping: - Segment Sections... - 00 - 01 .interp - 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr -.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text -.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr - 03 .fini_array .init_array .dynamic .got .data .bss - 04 .dynamic - 05 .note.ABI-tag .note.gnu.build-id - 06 .eh_frame_hdr - 07 - 08 .ARM.extab .ARM.exidx - 09 .fini_array .init_array .dynamic .got - -arm-oe-linux-gnueabi-readelf -l -./1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw - -Elf file type is DYN (Shared object file) -Entry point 0x31cd1 -There are 10 program headers, starting at offset 52 - -Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align - PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 -readelf: Error: the PHDR segment is not covered by a LOAD segment - INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 - [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] - LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 - LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 - DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 - NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 - GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 - EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 - GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 - - Section to Segment mapping: - Segment Sections... - 00 - 01 .interp - 02 .interp .note.ABI-tag .note.gnu.build-id .dynsym .dynstr -.gnu.hash .gnu.version .gnu.version_r .rel.dyn .rel.plt .init .plt .text -.fini .ARM.extab .ARM.exidx .rodata .eh_frame .eh_frame_hdr - 03 .fini_array .init_array .dynamic .got .data .bss - 04 .dynamic - 05 .note.ABI-tag .note.gnu.build-id - 06 .eh_frame_hdr - 07 - 08 .ARM.extab .ARM.exidx - 09 .fini_array .init_array .dynamic .got - -And the diff between these 2: - -1_2.22-r0-old/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf -1_2.23-r0-new/sysroot-destdir/usr/lib/libhugetlbfs/tests/obj32/linkhuge_rw.readelf - Elf file type is DYN (Shared object file) --Entry point 0x201105 -+Entry point 0x31cd1 - There are 10 program headers, starting at offset 52 - - Program Headers: - Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align -- PHDR 0x000034 0x00200034 0x00200034 0x00140 0x00140 R 0x4 -- INTERP 0x000174 0x00200174 0x00200174 0x0001d 0x0001d R 0x1 -+ PHDR 0x000000 0x00000000 0x00000000 0x00000 0x00000 R 0 -+readelf: Error: the PHDR segment is not covered by a LOAD segment -+ INTERP 0x030d40 0x00030d40 0x00030d40 0x0001d 0x0001d R 0x1 - [Requesting program interpreter: /usr/lib/ld-linux-armhf.so.3] -- LOAD 0x000000 0x00200000 0x00200000 0x1222c 0x1222c R E 0x200000 -- LOAD 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x102e0 0x202ec RW 0x200000 -- DYNAMIC 0x1ffdf8 0x005ffdf8 0x005ffdf8 0x00128 0x00128 RW 0x4 -- NOTE 0x000194 0x00200194 0x00200194 0x00044 0x00044 R 0x4 -- GNU_EH_FRAME 0x012224 0x00212224 0x00212224 0x00008 0x00008 R 0x4 -+ LOAD 0x030d40 0x00030d40 0x00030d40 0x120b8 0x120b8 R E 0x200000 -+ LOAD 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x102e0 0x202ec RW 0x200000 -+ DYNAMIC 0x1ffdf8 0x003ffdf8 0x003ffdf8 0x00128 0x00128 RW 0x4 -+ NOTE 0x030d60 0x00030d60 0x00030d60 0x00044 0x00044 R 0x4 -+ GNU_EH_FRAME 0x042df0 0x00042df0 0x00042df0 0x00008 0x00008 R 0x4 - GNU_STACK 0x000000 0x00000000 0x00000000 0x00000 0x00000 RW 0x10 -- EXIDX 0x001c5c 0x00201c5c 0x00201c5c 0x00008 0x00008 R 0x4 -- GNU_RELRO 0x1ffdf0 0x005ffdf0 0x005ffdf0 0x00210 0x00210 RW 0x4 -+ EXIDX 0x032828 0x00032828 0x00032828 0x00008 0x00008 R 0x4 -+ GNU_RELRO 0x1ffdf0 0x003ffdf0 0x003ffdf0 0x00210 0x00210 RW 0x4 - - Section to Segment mapping: - -Revert fixes this build issue, but I still don't see why it fails this way. - -Upstream-Status: Pending - -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# Date: Wed Sep 16 13:43:09 2020 +0200 -# -# On branch jansa/master -# Changes to be committed: -# new file: meta-oe/recipes-benchmark/libhugetlbfs/files/0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch -# modified: meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb -# -# Untracked files: -# counts.txt -# diff -# log.svn -# log.svn2 -# wip/ -# ---- - ld.hugetlbfs | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/ld.hugetlbfs b/ld.hugetlbfs -index 5e4e497..6ee8238 100755 ---- a/ld.hugetlbfs -+++ b/ld.hugetlbfs -@@ -130,9 +130,7 @@ if [ "$HTLB_ALIGN" == "slice" ]; then - # targeting the ARM platform one needs to explicitly set the text segment offset - # otherwise it will be NULL. - case "$EMU" in -- armelf*_linux_eabi|aarch64elf*|aarch64linux*) -- printf -v TEXTADDR "%x" "$SLICE_SIZE" -- HTLBOPTS="$HTLBOPTS -Ttext-segment=$TEXTADDR" ;; -+ armelf*_linux_eabi|aarch64elf*|aarch64linux*) HTLBOPTS="$HTLBOPTS -Ttext-segment=$SLICE_SIZE" ;; - elf_i386) HTLBOPTS="$HTLBOPTS -Ttext-segment=0x08000000" ;; - elf64ppc|elf64lppc) - if [ "$MMU_TYPE" == "Hash" ] ; then --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch index a13c5389fb..3dbc34d08d 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch @@ -1,20 +1,20 @@ -From 183a4dafe141197de5840f2e48c266ef209307aa Mon Sep 17 00:00:00 2001 +From b448672f1bc08dcef2ae07727ae6f124a3032a35 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Mon, 18 Jun 2012 16:37:05 +0800 Subject: [PATCH] skip checking LIB32 and LIB64 if they point to the same place Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Ting Liu <b28495@freescale.com> +Signed-off-by: Ting Liu <b28495@freescale.com> --- - Makefile | 1 - + Makefile.in | 1 - 1 file changed, 1 deletion(-) -diff --git a/Makefile b/Makefile -index 51e41f0..373df3c 100644 ---- a/Makefile -+++ b/Makefile -@@ -177,7 +177,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) +diff --git a/Makefile.in b/Makefile.in +index 65ae5a4..25be577 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -196,7 +196,6 @@ REALLIB32 = $(realpath $(PREFIX)/$(LIB32)) REALLIB64 = $(realpath $(PREFIX)/$(LIB64)) ifneq ($(realpath $(PREFIX)),) ifeq ($(REALLIB32),$(REALLIB64)) @@ -22,3 +22,6 @@ index 51e41f0..373df3c 100644 endif endif +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch deleted file mode 100644 index 78a4cb0fc2..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch +++ /dev/null @@ -1,31 +0,0 @@ -From b6dba773491bbb7b4664dacdd87a12af860f1bd8 Mon Sep 17 00:00:00 2001 -From: Oleksiy Obitotskyy <oobitots@cisco.com> -Date: Thu, 28 Jan 2021 05:43:33 -0800 -Subject: [PATCH] tests/makefile: Append CPPFLAGS rather then override - -CPPFLAGS overrided and we could miss some options needed. - -Upstream-Status: Submitted -Signed-off-by: Oleksiy Obitotskyy <oobitots@cisco.com> ---- - tests/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/tests/Makefile b/tests/Makefile -index 0ca3716..d262932 100644 ---- a/tests/Makefile -+++ b/tests/Makefile -@@ -33,8 +33,8 @@ HELPERS = get_hugetlbfs_path compare_kvers - HELPER_LIBS = libheapshrink.so - BADTOOLCHAIN = bad-toolchain.sh - --CFLAGS = -O2 -Wall -g --CPPFLAGS = -I.. -+CFLAGS += -O2 -Wall -g -+CPPFLAGS += -I.. - STATIC_LIBHUGE = -Wl,--whole-archive -lhugetlbfs -Wl,--no-whole-archive - STATIC_LDLIBS = -Wl,--no-as-needed -lpthread - LDLIBS = $(STATIC_LDLIBS) -ldl -lhugetlbfs_privutils --- -2.26.2.Cisco - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch index f95e9e85a4..1b99c007f5 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-avoid-search-host-library-path-for-cros.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch @@ -1,4 +1,4 @@ -From 82a4f60ab24dff121f5f9d3bbcd9a8a28bb7caef Mon Sep 17 00:00:00 2001 +From d3903cbe348c6ecb2f38b37f20dafa6b0ca3b114 Mon Sep 17 00:00:00 2001 From: Chunrong Guo <B40290@freescale.com> Date: Sun, 8 Sep 2013 23:21:49 -0500 Subject: [PATCH] libhugetlbfs: avoid search host library path for cross @@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs: avoid search host library path for cross Upstream-Status: Inappropriate [oe-core specific] Signed-off-by: Chunrong Guo <B40290@freescale.com> - --- ldscripts/elf32ppclinux.xB | 2 +- ldscripts/elf32ppclinux.xBDT | 2 +- @@ -95,3 +94,6 @@ index 1855202..c62d245 100644 INPUT(-lhugetlbfs); /* Do we need any of these for elf? __DYNAMIC = 0; */ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch index b8b2f8e6fb..98cdf2f51c 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/tests-Makefile-install-static-4G-edge-testcases.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-tests-Makefile-install-static-4G-edge-testcases.patch @@ -1,22 +1,21 @@ -From f1ad8ff887f16daee8d06eca3df0f2541bfdaac0 Mon Sep 17 00:00:00 2001 +From 3e54866a0ea3c9e933e91213cbe6e55b7ff67b87 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Mon, 23 Sep 2013 08:00:55 +0000 -Subject: [PATCH] libhugetlbfs: add recipe - -Upstream-Status: Submitted +Subject: [PATCH] tests/Makefile: install static 4G edge testcases TESTS_64 is empty, install will fail due to missing file operand -Signed-off-by: Ting Liu <b28495@freescale.com> +Upstream-Status: Submitted +Signed-off-by: Ting Liu <b28495@freescale.com> --- - tests/Makefile | 2 +- + tests/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/tests/Makefile b/tests/Makefile -index 073df96..0ca3716 100644 ---- a/tests/Makefile -+++ b/tests/Makefile +diff --git a/tests/Makefile.in b/tests/Makefile.in +index d33a228..d262932 100644 +--- a/tests/Makefile.in ++++ b/tests/Makefile.in @@ -295,7 +295,7 @@ obj64/install: $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 @@ -26,3 +25,6 @@ index 073df96..0ca3716 100644 $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64) install: $(OBJDIRS:%=%/install) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch index 83934abef8..6b010365a0 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch @@ -1,4 +1,4 @@ -From 0077532b07e268347cb8557be6d70148d5f0e840 Mon Sep 17 00:00:00 2001 +From 86d3ebfc4da5ccbc82fdee4abaf2cbf758d82403 Mon Sep 17 00:00:00 2001 From: Ting Liu <b28495@freescale.com> Date: Wed, 21 Aug 2013 15:44:57 +0800 Subject: [PATCH] run_test.py: not use hard coded path ../obj/hugeadm @@ -20,10 +20,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tests/run_tests.py b/tests/run_tests.py -index 018264d..0aabcd1 100755 +index 4793262..6cd0241 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py -@@ -245,9 +245,19 @@ def get_pagesizes(): +@@ -250,9 +250,19 @@ def get_pagesizes(): Use libhugetlbfs' hugeadm utility to get a list of page sizes that have active mount points and at least one huge page allocated to the pool. """ @@ -45,5 +45,5 @@ index 018264d..0aabcd1 100755 return sizes -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch index 7cc180a4b7..fc8776af66 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/libhugetlbfs-elf_i386-avoid-search-host-library-path.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch @@ -1,4 +1,4 @@ -From b5887693d90c430291b644c2f5713b5fdd1777ce Mon Sep 17 00:00:00 2001 +From 8c7a379876e3c7a32bef8620f94a85d20b7b186f Mon Sep 17 00:00:00 2001 From: Jackie Huang <jackie.huang@windriver.com> Date: Tue, 4 Nov 2014 00:49:11 -0800 Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for @@ -7,7 +7,6 @@ Subject: [PATCH] libhugetlbfs/elf_i386: avoid search host library path for Upstream-Status: Inappropriate [cross compile specific] Signed-off-by: Jackie Huang <jackie.huang@windriver.com> - --- ldscripts/elf_i386.xB | 1 - ldscripts/elf_i386.xBDT | 1 - @@ -37,3 +36,6 @@ index d72aebe..3bac1b1 100644 INPUT(-lhugetlbfs); /* Do we need any of these for elf? __DYNAMIC = 0; */ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch index 914b0514f8..33a4efb1fa 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-include-stddef.h-for-ptrdiff_t.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-stddef.h-for-ptrdiff_t.patch @@ -1,18 +1,17 @@ -From 351d1de09dd80049b7a2cb02c5750635d0389873 Mon Sep 17 00:00:00 2001 +From 5fe5dae674e259bcdd57b9c6a0004111ab0700ce Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:25:57 -0700 Subject: [PATCH] include stddef.h for ptrdiff_t -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- morecore.c | 1 + 1 file changed, 1 insertion(+) diff --git a/morecore.c b/morecore.c -index 6563bbd..0eef782 100644 +index 405c566..0edccd2 100644 --- a/morecore.c +++ b/morecore.c @@ -19,6 +19,7 @@ @@ -23,3 +22,6 @@ index 6563bbd..0eef782 100644 #include <stdio.h> #include <stdlib.h> #include <malloc.h> +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch index 7ad6c43eb1..5b2c91b8a1 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0002-Mark-glibc-specific-code-so.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0007-Mark-glibc-specific-code-so.patch @@ -1,21 +1,20 @@ -From 0f548286848c70aa325c6748d80e8651389b4938 Mon Sep 17 00:00:00 2001 +From c98e64c56d0118a2d5f950eaceaed0e85eaa2543 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:32:59 -0700 Subject: [PATCH] Mark glibc specific code so -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- morecore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/morecore.c b/morecore.c -index 0eef782..d48509c 100644 +index 0edccd2..db22216 100644 --- a/morecore.c +++ b/morecore.c -@@ -364,6 +364,7 @@ void hugetlbfs_setup_morecore(void) +@@ -371,6 +371,7 @@ void hugetlbfs_setup_morecore(void) INFO("setup_morecore(): heapaddr = 0x%lx\n", heapaddr); @@ -23,7 +22,7 @@ index 0eef782..d48509c 100644 heaptop = heapbase = (void *)heapaddr; if (__hugetlb_opts.thp_morecore) __morecore = &thp_morecore; -@@ -371,7 +372,6 @@ void hugetlbfs_setup_morecore(void) +@@ -378,7 +379,6 @@ void hugetlbfs_setup_morecore(void) __morecore = &hugetlbfs_morecore; /* Set some allocator options more appropriate for hugepages */ @@ -31,9 +30,13 @@ index 0eef782..d48509c 100644 if (__hugetlb_opts.shrink_ok) mallopt(M_TRIM_THRESHOLD, hpage_size + hpage_size / 2); else -@@ -381,4 +381,5 @@ void hugetlbfs_setup_morecore(void) +@@ -388,5 +388,6 @@ void hugetlbfs_setup_morecore(void) * This doesn't appear to prohibit malloc() from falling back * to mmap() if we run out of hugepages. */ mallopt(M_MMAP_MAX, 0); +#endif } + #endif /* HAS_MORECORE */ +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch index 858a8e511a..73844b71f9 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch @@ -1,20 +1,19 @@ -From 9ff04d7acc700387e3837f8ab11a41efea5ee8b0 Mon Sep 17 00:00:00 2001 +From 4f69eb130dc2c67a90f2460cedb78f6db11dd6d2 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:44:26 -0700 Subject: [PATCH] alloc.c: Avoid sysconf(_SC_LEVEL2_CACHE_LINESIZE) on linux musl does not have it -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- alloc.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/alloc.c b/alloc.c -index bce9464..cf7eb40 100644 +index b8ed663..a58c43d 100644 --- a/alloc.c +++ b/alloc.c @@ -245,6 +245,19 @@ void free_huge_pages(void *ptr) @@ -46,3 +45,6 @@ index bce9464..cf7eb40 100644 linemod = time(NULL); } +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch index c3f7b3e479..4fbf30e24b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0004-shm.c-Mark-glibc-specific-changes-so.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0009-shm.c-Mark-glibc-specific-changes-so.patch @@ -1,13 +1,12 @@ -From 9ce323432a7f4d99f617970c7e35b607b9bbf843 Mon Sep 17 00:00:00 2001 +From 37239dd5f14a34b05e77b3ca6e34f96161f1339a Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:48:04 -0700 Subject: [PATCH] shm.c: Mark glibc specific changes so -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- shm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) @@ -28,3 +27,6 @@ index 1f82cab..9447b63 100644 /* call syscall shmget through the generic syscall mechanism */ static int syscall_shmget(key_t key, size_t size, int shmflg) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch index 8bd1633392..a530a5267a 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0005-Include-dirent.h-for-ino_t.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0010-Include-dirent.h-for-ino_t.patch @@ -1,4 +1,4 @@ -From bb8c370aaaf25b1fe1fbf984e73177018026cb91 Mon Sep 17 00:00:00 2001 +From ec9163c0436d1c77cecc941aca2e524b26001b15 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:51:02 -0700 Subject: [PATCH] Include dirent.h for ino_t @@ -6,13 +6,13 @@ Subject: [PATCH] Include dirent.h for ino_t Fixes error: unknown type name 'ino_t'; did you mean 'int'? +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> Update for 2.22. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- -Upstream-Status: Pending - tests/hugetests.h | 1 + 1 file changed, 1 insertion(+) @@ -29,5 +29,5 @@ index bc4e16a..fbe4dc0 100644 #include "libhugetlbfs_privutils.h" -- -2.7.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch index e4f8030961..08de396d9f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0006-include-limits.h-for-PATH_MAX.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0011-include-limits.h-for-PATH_MAX.patch @@ -1,4 +1,4 @@ -From 5f64aa8c47c2d3a155a97e262f89cc47394a69eb Mon Sep 17 00:00:00 2001 +From 79b76433f4b6f2f14914817b7e8ac0db1df39250 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 21 Jun 2018 19:58:53 -0700 Subject: [PATCH] include limits.h for PATH_MAX @@ -7,17 +7,16 @@ Fixes error: 'PATH_MAX' undeclared -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- hugeadm.c | 1 + tests/gethugepagesizes.c | 1 + 2 files changed, 2 insertions(+) diff --git a/hugeadm.c b/hugeadm.c -index fe4211d..8db274c 100644 +index 79a4867..65d5136 100644 --- a/hugeadm.c +++ b/hugeadm.c @@ -33,6 +33,7 @@ @@ -29,7 +28,7 @@ index fe4211d..8db274c 100644 #include <sys/stat.h> #include <sys/types.h> diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c -index 9551b38..2645e3f 100644 +index 5777265..990db69 100644 --- a/tests/gethugepagesizes.c +++ b/tests/gethugepagesizes.c @@ -29,6 +29,7 @@ @@ -40,3 +39,6 @@ index 9551b38..2645e3f 100644 #include "hugetests.h" +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch index e45f283b38..0583df95ad 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-huge_page_setup_helper-use-python3-interpreter.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0012-huge_page_setup_helper-use-python3-interpreter.patch @@ -1,4 +1,4 @@ -From b77c61de4d88d2c6e5d31f4f5a5877cc4c61272e Mon Sep 17 00:00:00 2001 +From e5580e392b8764e1e6509c5a4ed13fb2ce7566b9 Mon Sep 17 00:00:00 2001 From: Andrey Zhizhikin <andrey.z@gmail.com> Date: Mon, 27 Jan 2020 17:27:55 +0000 Subject: [PATCH] huge_page_setup_helper: use python3 interpreter @@ -15,7 +15,7 @@ Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/huge_page_setup_helper.py b/huge_page_setup_helper.py -index a9ba2bf..7ba0c92 100755 +index 01fc8dc..79a88ca 100755 --- a/huge_page_setup_helper.py +++ b/huge_page_setup_helper.py @@ -1,4 +1,4 @@ @@ -25,5 +25,5 @@ index a9ba2bf..7ba0c92 100755 # # Tool to set up Linux large page support with minimal effort -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..264a535cc7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0013-elflink.c-include-libgen.h-for-basename.patch @@ -0,0 +1,41 @@ +From 825444522d698991be04bbfa683a7cf785c6f72c Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Wed, 2 Oct 2024 00:06:34 +0800 +Subject: [PATCH] elflink.c: include libgen.h for basename + +Basename prototype has been removed from string.h from latest musl[1]. +Compilers e.g. clang-18 flags the absense of prototype as error. +Therefore include libgen.h for providing it. + +elflink.c: In function 'get_shared_file_name': +elflink.c:363:19: error: implicit declaration of function 'basename' [-Wimplicit-function-declaration] + 363 | binary2 = basename(binary); + | ^~~~~~~~ +elflink.c:363:17: error: assignment to 'char *' from 'int' makes pointer from integer without a cast [-Wint-conversion] + 363 | binary2 = basename(binary); + | ^ + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Pending + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + elflink.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/elflink.c b/elflink.c +index 278d338..0e78d61 100644 +--- a/elflink.c ++++ b/elflink.c +@@ -38,6 +38,7 @@ + #include <limits.h> + #include <elf.h> + #include <dlfcn.h> ++#include <libgen.h> + + #include "version.h" + #include "hugetlbfs.h" +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb new file mode 100644 index 0000000000..d82e03e81f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_2.24.bb @@ -0,0 +1,87 @@ +SUMMARY = "A library which provides easy access to huge pages of memory" +HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" +LICENSE = "LGPL-2.1-only" +LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "sysfsutils" +RDEPENDS:${PN} += "bash python3-core" +RDEPENDS:${PN}-tests += "bash python3-core python3-resource" + +PE = "1" + +SRCREV = "1322884fb0d55dc55f53563c1aa6328d118997e7" +SRC_URI = " \ + git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \ + file://0001-skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ + file://0002-libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ + file://0003-tests-Makefile-install-static-4G-edge-testcases.patch \ + file://0004-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ + file://0005-libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ + file://0006-include-stddef.h-for-ptrdiff_t.patch \ + file://0007-Mark-glibc-specific-code-so.patch \ + file://0008-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ + file://0009-shm.c-Mark-glibc-specific-changes-so.patch \ + file://0010-Include-dirent.h-for-ino_t.patch \ + file://0011-include-limits.h-for-PATH_MAX.patch \ + file://0012-huge_page_setup_helper-use-python3-interpreter.patch \ + file://0013-elflink.c-include-libgen.h-for-basename.patch \ +" + +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" + +LIBARGS = "LIB32=${baselib} LIB64=${baselib}" +LIBHUGETLBFS_ARCH = "${TARGET_ARCH}" +LIBHUGETLBFS_ARCH:powerpc = "ppc" +LIBHUGETLBFS_ARCH:powerpc64 = "ppc64" +LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le" +EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2" +PARALLEL_MAKE = "" +CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0" + +export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts" + +TARGET_CC_ARCH += "${LDFLAGS}" + +LDFLAGS += "-B${S}" + +inherit autotools-brokensep cpan-base + +#The CUSTOM_LDSCRIPTS doesn't work with the gold linker +do_configure:prepend() { + if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then + sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile.in + fi + + ln -sf ld.hugetlbfs ${S}/ld + ln -sf ld.hugetlbfs ${S}/ld.bfd + ln -sf ld.hugetlbfs ${S}/ld.gold + ln -sf ld.hugetlbfs ${S}/ld.lld +} + +do_install() { + oe_runmake PREFIX=${prefix} DESTDIR=${D} \ + INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \ + INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \ + install-tests + + sed -i \ + -e 's|${RECIPE_SYSROOT_NATIVE}||g' \ + -e 's|${RECIPE_SYSROOT}||g' \ + -e 's|${S}||g' \ + `find ${D}${libdir}/libhugetlbfs/tests -name dummy.ldscript` +} + +PACKAGES =+ "${PN}-tests " +FILES:${PN} += "${libdir}/*.so" +FILES:${PN}-dev = "${includedir}" +FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" +FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests" + +INSANE_SKIP:${PN} = "dev-so" + +INHIBIT_PACKAGE_STRIP = "1" +INHIBIT_PACKAGE_DEBUG_SPLIT = "1" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb deleted file mode 100644 index 80af9873b1..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "A library which provides easy access to huge pages of memory" -HOMEPAGE = "https://github.com/libhugetlbfs/libhugetlbfs" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "sysfsutils" -RDEPENDS:${PN} += "bash python3-core" -RDEPENDS:${PN}-tests += "bash python3-core" - -PV = "2.23" -PE = "1" - -SRCREV = "6b126a4d7da9490fa40fe7e1b962edcb939feddc" -SRC_URI = " \ - git://github.com/libhugetlbfs/libhugetlbfs.git;protocol=https;branch=master \ - file://skip-checking-LIB32-and-LIB64-if-they-point-to-the-s.patch \ - file://libhugetlbfs-avoid-search-host-library-path-for-cros.patch \ - file://tests-Makefile-install-static-4G-edge-testcases.patch \ - file://0001-run_test.py-not-use-hard-coded-path-.-obj-hugeadm.patch \ - file://libhugetlbfs-elf_i386-avoid-search-host-library-path.patch \ - file://0001-include-stddef.h-for-ptrdiff_t.patch \ - file://0002-Mark-glibc-specific-code-so.patch \ - file://0003-alloc.c-Avoid-sysconf-_SC_LEVEL2_CACHE_LINESIZE-on-l.patch \ - file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ - file://0005-Include-dirent.h-for-ino_t.patch \ - file://0006-include-limits.h-for-PATH_MAX.patch \ - file://0001-huge_page_setup_helper-use-python3-interpreter.patch \ - file://0001-Revert-ld.hugetlbfs-fix-Ttext-segment-argument-on-AA.patch \ - file://0001-tests-makefile-Append-CPPFLAGS-rather-then-override.patch \ -" - -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" - -S = "${WORKDIR}/git" - -COMPATIBLE_HOST = "(i.86|x86_64|powerpc|powerpc64|aarch64|arm).*-linux*" - -LIBARGS = "LIB32=${baselib} LIB64=${baselib}" -LIBHUGETLBFS_ARCH = "${TARGET_ARCH}" -LIBHUGETLBFS_ARCH:powerpc = "ppc" -LIBHUGETLBFS_ARCH:powerpc64 = "ppc64" -LIBHUGETLBFS_ARCH:powerpc64le = "ppc64le" -EXTRA_OEMAKE = "'ARCH=${LIBHUGETLBFS_ARCH}' 'OPT=${CFLAGS}' 'CC=${CC}' ${LIBARGS} BUILDTYPE=NATIVEONLY V=2" -PARALLEL_MAKE = "" -CFLAGS += "-fexpensive-optimizations -frename-registers -fomit-frame-pointer -g0" - -export HUGETLB_LDSCRIPT_PATH="${S}/ldscripts" - -TARGET_CC_ARCH += "${LDFLAGS}" - -#The CUSTOM_LDSCRIPTS doesn't work with the gold linker -inherit cpan-base -do_configure() { - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'ld-is-gold', d)}" ]; then - sed -i 's/CUSTOM_LDSCRIPTS = yes/CUSTOM_LDSCRIPTS = no/' Makefile - fi -} - -do_install() { - oe_runmake PREFIX=${prefix} DESTDIR=${D} \ - INST_TESTSDIR32=${libdir}/libhugetlbfs/tests \ - INST_TESTSDIR64=${libdir}/libhugetlbfs/tests \ - install-tests -} - - -PACKAGES =+ "${PN}-tests " -FILES:${PN} += "${libdir}/*.so" -FILES:${PN}-dev = "${includedir}" -FILES:${PN}-dbg += "${libdir}/libhugetlbfs/tests/obj32/.debug ${libdir}/libhugetlbfs/tests/obj64/.debug" -FILES:${PN}-tests += "${libdir}/libhugetlbfs/tests" - -INSANE_SKIP:${PN} = "dev-so" - -INHIBIT_PACKAGE_STRIP = "1" -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" - -# see https://github.com/libhugetlbfs/libhugetlbfs/issues/52 -SKIP_RECIPE[libhugetlbfs] ?= "Needs porting to glibc 2.34+" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 629b123042..2cfeb72416 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -6,6 +6,10 @@ SRCREV = "f97f1ae321d1fb8111a2c638075702ed2512ff07" PV = "3.6" SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" +# Current PV is not a git tag but a Readme content, track commits to detect +# upstream updates +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" # installing in /opt/S-suite since the package has diff --git a/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb b/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb index b392581ecb..db862c896b 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/acpitool/acpitool_0.5.1.bb @@ -11,3 +11,5 @@ inherit autotools SRC_URI[md5sum] = "9e4ec55201be0be71ffbc56d38b42b57" SRC_URI[sha256sum] = "004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/acpitool/files/acpitool/" diff --git a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb index 4688ae860b..c278a0982a 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/bolt/bolt_0.9.6.bb @@ -18,5 +18,5 @@ inherit cmake pkgconfig meson features_check FILES:${PN} += "${datadir}/dbus-1/* \ ${datadir}/polkit-1/* \ - ${libdir}/systemd/* \ - " + ${systemd_system_unitdir} \ +" diff --git a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb index 302a61e8a8..b623d0525a 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/con2fbmap/con2fbmap_git.bb @@ -13,6 +13,9 @@ SRC_URI = "git://gitlab.com/pibox/con2fbmap.git;protocol=https;branch=master \ file://0001-con2fbmap-Add-missing-include-on-string.h.patch \ " +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb index cb62ee46af..fbe9483740 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/cpufrequtils/cpufrequtils_008.bb @@ -14,6 +14,9 @@ SRC_URI = "git://github.com/emagii/cpufrequtils.git;branch=master;protocol=https file://0001-dont-unset-cflags.patch \ " +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + EXTRA_OEMAKE:append = " ${@['', 'NLS=false']['${USE_NLS}' == 'no']} " diff --git a/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch new file mode 100644 index 0000000000..fbc0f5a18e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0001-add-support-for-cross-compilation.patch @@ -0,0 +1,21 @@ +Author: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> +Date: Fri Jul 5 16:39:13 2024 +0200 +Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/86] + + Makefile: allow overriding CC + + Signed-off-by: Maciej Pijanowski <maciej.pijanowski@3mdeb.com> + +diff --git a/Makefile b/Makefile +index 139e5c0c3c3c..226303a6921e 100644 +--- a/Makefile ++++ b/Makefile +@@ -12,7 +12,7 @@ endif + endif + + PROGRAM = dpcmd +-CC = gcc ++CC ?= gcc + PREFIX ?= /usr/local + + PKG_CONFIG ?= pkg-config diff --git a/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch new file mode 100644 index 0000000000..0fc8ac5bd2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher/0002-Makefile-add-conditional-stripping.patch @@ -0,0 +1,39 @@ +From dac9d0ea5c419049c9ab0a5ba90d15d77a3271b0 Mon Sep 17 00:00:00 2001 +From: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> +Date: Mon, 22 Jul 2024 13:02:59 +0000 +Subject: [PATCH] Makefile: add conditional stripping +Upstream-Status: Submitted [https://github.com/DediProgSW/SF100Linux/pull/88] + +This patch introduces a `NOSTRIP` conditional flag to the `install` +target in the Makefile. The purpose of this flag is to allow the +disabling of binary stripping during installation. This is +particularly useful in development environments, such as BitBake, +which handle stripping internally. + +When `NOSTRIP` is set to `1`, the `strip` command will be skipped +during the installation process, preventing potential conflicts or +redundant operations. + +Signed-off-by: Tymoteusz Burak <tymoteusz.burak@3mdeb.com> + +--- + Makefile | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Makefile b/Makefile +index 139e5c0..8b33320 100644 +--- a/Makefile ++++ b/Makefile +@@ -58,7 +58,9 @@ install: $(PROGRAM) + [ $(shell id -u) -eq 0 ] || (echo "Error: install needs root privileges" && false) + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/share/DediProg + echo -n "install: " && install -v -o 0 -g 0 -m 0755 $(PROGRAM) $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) ++ifneq ($(NOSTRIP),1) + strip $(DESTDIR)$(PREFIX)/bin/$(PROGRAM) ++endif + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)$(PREFIX)/share/DediProg + echo -n "install: " && install -v -o 0 -g 0 -m 0644 ChipInfoDb.dedicfg $(DESTDIR)$(PREFIX)/share/DediProg/ChipInfoDb.dedicfg + install -v -o 0 -g 0 -m 755 -d $(DESTDIR)/etc/udev/rules.d +-- +2.30.2 + diff --git a/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb new file mode 100644 index 0000000000..83a88ab75f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-bsp/dediprog-flasher/dediprog-flasher_1.14.20.bb @@ -0,0 +1,29 @@ +DESCRIPTION = "Linux software for Dediprog SF100 and SF600 SPI flash programmers" +SECTION = "devel" +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a23a74b3f4caf9616230789d94217acb" + +DEPENDS = "libusb" + +SRCREV = "e691f2d432144e3dbc82e9e0eea1ebaed4f3becf" +SRC_URI = " \ + git://github.com/DediProgSW/SF100Linux.git;protocol=https;branch=master \ + file://0001-add-support-for-cross-compilation.patch \ + file://0002-Makefile-add-conditional-stripping.patch \ + " + +EXTRA_OEMAKE = "NOSTRIP=1" + +PV = "1.0+${SRCPV}" + +S = "${WORKDIR}/git" + +do_install () { + oe_runmake DESTDIR=${D} PREFIX=/usr install +} + +FILES:${PN} += " \ + ${datadir}/DediProg \ +" + +inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb index f3760a40e6..2b7ed256eb 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/firmwared/firmwared_git.bb @@ -13,6 +13,9 @@ SRC_URI = "git://github.com/teg/firmwared.git;branch=master;protocol=https \ PV = "0+git" SRCREV = "2e6b5db43d63a5c0283a4cae9a6a20b7ad107a04" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" DEPENDS = "glib-2.0 systemd" diff --git a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb index e6c276ba4e..15cde9f100 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.9.18.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/fwupd/fwupd_1.9.24.bb @@ -6,14 +6,15 @@ DEPENDS = "glib-2.0 libxmlb json-glib libjcat gcab vala-native python3-jinja2-na SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://run-ptest" -SRC_URI[sha256sum] = "4e554f77a8a73383a41d5637b62e6c8a8936e66cd1d18585baf29d7fe47fc4d7" +SRC_URI[sha256sum] = "12f560b35dbed981fde8cf774c6d1f2e658a157d3a63d6c439bf418dbcc44b4c" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" # Machine-specific as we examine MACHINE_FEATURES to decide whether to build the UEFI plugins PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages useradd +inherit meson vala gobject-introspection systemd bash-completion pkgconfig gi-docgen ptest manpages GIDOCGEN_MESON_OPTION = 'docs' GIDOCGEN_MESON_ENABLE_FLAG = 'enabled' @@ -115,17 +116,6 @@ DISABLE_NON_X86:x86 = "" DISABLE_NON_X86:x86-64 = "" PACKAGECONFIG:remove = "${DISABLE_NON_X86}" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" - -do_install:append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'polkit', 'true', 'false', d)}; then - #Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - fi -} - FILES:${PN} += "${libdir}/fwupd-plugins-* \ ${libdir}/fwupd-${PV} \ ${systemd_unitdir} \ @@ -140,3 +130,5 @@ FILES:${PN} += "${libdir}/fwupd-plugins-* \ FILES:${PN}-ptest += "${libexecdir}/installed-tests/ \ ${datadir}/installed-tests/" RDEPENDS:${PN}-ptest += "gnome-desktop-testing" + +INSANE_SKIP:${PN}-ptest += "buildpaths" diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch deleted file mode 100644 index be1452af51..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-nvme-Use-C99-types-for-uint32_t.patch +++ /dev/null @@ -1,88 +0,0 @@ -From ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458 Mon Sep 17 00:00:00 2001 -From: Sam James <sam@gentoo.org> -Date: Sat, 4 May 2024 09:13:06 +0100 -Subject: [PATCH] nvme: Use C99 types for uint32_t - -<stdint.h> provides `uint32_t`, while `u_int_32` is an unofficial/internal -typedef that glibc happens to provide. This fixes the build on musl. - -Bug: https://bugs.gentoo.org/931194 - -Upstream-Status: Backport [https://github.com/linux-nvme/nvme-cli/commit/ac2ff1dbe0b44953de636c50c7d7f8c1e9f1e458] -Signed-off-by: Sam James <sam@gentoo.org> ---- - nvme.c | 13 +++++++------ - util/base64.c | 5 +++-- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/nvme.c b/nvme.c -index 46a2399a..5409ddf2 100644 ---- a/nvme.c -+++ b/nvme.c -@@ -34,6 +34,7 @@ - #include <inttypes.h> - #include <locale.h> - #include <stdio.h> -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> -@@ -9081,8 +9082,8 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru - - unsigned char decoded_key[128]; - unsigned int decoded_len; -- u_int32_t crc = crc32(0L, NULL, 0); -- u_int32_t key_crc; -+ uint32_t crc = crc32(0L, NULL, 0); -+ uint32_t key_crc; - int err = 0, hmac; - struct config { - char *key; -@@ -9150,10 +9151,10 @@ static int check_dhchap_key(int argc, char **argv, struct command *command, stru - return -EINVAL; - } - crc = crc32(crc, decoded_key, decoded_len); -- key_crc = ((u_int32_t)decoded_key[decoded_len]) | -- ((u_int32_t)decoded_key[decoded_len + 1] << 8) | -- ((u_int32_t)decoded_key[decoded_len + 2] << 16) | -- ((u_int32_t)decoded_key[decoded_len + 3] << 24); -+ key_crc = ((uint32_t)decoded_key[decoded_len]) | -+ ((uint32_t)decoded_key[decoded_len + 1] << 8) | -+ ((uint32_t)decoded_key[decoded_len + 2] << 16) | -+ ((uint32_t)decoded_key[decoded_len + 3] << 24); - if (key_crc != crc) { - nvme_show_error("CRC mismatch (key %08x, crc %08x)", key_crc, crc); - return -EINVAL; -diff --git a/util/base64.c b/util/base64.c -index 7f47cda6..0e89f2e9 100644 ---- a/util/base64.c -+++ b/util/base64.c -@@ -20,6 +20,7 @@ - * MA 02110-1301, USA. - */ - -+#include <stdint.h> - #include <stdlib.h> - #include <string.h> - #include <errno.h> -@@ -42,7 +43,7 @@ static const char base64_table[65] = - int base64_encode(const unsigned char *src, int srclen, char *dst) - { - int i, bits = 0; -- u_int32_t ac = 0; -+ uint32_t ac = 0; - char *cp = dst; - - for (i = 0; i < srclen; i++) { -@@ -77,7 +78,7 @@ int base64_encode(const unsigned char *src, int srclen, char *dst) - */ - int base64_decode(const char *src, int srclen, unsigned char *dst) - { -- u_int32_t ac = 0; -+ uint32_t ac = 0; - int i, bits = 0; - unsigned char *bp = dst; - --- -2.45.1 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch deleted file mode 100644 index 1881b18aac..0000000000 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli/0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 47d33d8da7a5b7310a2c2f4328115b439039e46c Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 21 May 2024 14:09:32 -0700 -Subject: [PATCH] plugins/ssstc: Replace __uint16_t with uint16_t - -uint16_t is ISO defined and comes from stdint.h, makes it -portable across glibc and musl on linux. - -Upstream-Status: Submitted [https://github.com/linux-nvme/nvme-cli/pull/2351] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugins/ssstc/ssstc-nvme.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/ssstc/ssstc-nvme.c b/plugins/ssstc/ssstc-nvme.c -index 03e4fe3f..302df988 100644 ---- a/plugins/ssstc/ssstc-nvme.c -+++ b/plugins/ssstc/ssstc-nvme.c -@@ -64,9 +64,9 @@ void show_ssstc_add_smart_log_jsn(struct nvme_additional_smart_log *smart, - unsigned int nsid, const char *devname) - { - struct json_object *root, *entry_stats, *dev_stats, *multi; -- __uint16_t wear_level_min = 0; -- __uint16_t wear_level_max = 0; -- __uint16_t wear_level_avg = 0; -+ uint16_t wear_level_min = 0; -+ uint16_t wear_level_max = 0; -+ uint16_t wear_level_avg = 0; - uint64_t raw_val = 0; - - root = json_create_object(); --- -2.45.1 - diff --git a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.10.2.bb index f4ddec88c4..2005a198aa 100644 --- a/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.9.1.bb +++ b/meta-openembedded/meta-oe/recipes-bsp/nvme-cli/nvme-cli_2.10.2.bb @@ -6,12 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8264535c0c4e9c6c335635c4026a8022 \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c libnvme" -SRCREV = "b340fd7dcf1aef76f8d46ab28bef3c170d310887" +SRCREV = "eeaa08c9a0e9184f3889df0bff3d2a23db6d6294" -SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https \ - file://0001-nvme-Use-C99-types-for-uint32_t.patch \ - file://0001-plugins-ssstc-Replace-__uint16_t-with-uint16_t.patch \ - " +SRC_URI = "git://github.com/linux-nvme/nvme-cli.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb index af4f2c54bb..a9bdbc916f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/ace/ace_6.5.19.bb @@ -13,6 +13,9 @@ SRC_URI = "https://github.com/DOCGroup/ACE_TAO/releases/download/ACE%2BTAO-6_5_1 " SRC_URI[sha256sum] = "739be290a38229aaa5b5150e6ea55ce427e80970f0ace4c5040ac46644526f41" +UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + COMPATIBLE_HOST:libc-musl = "null" S = "${WORKDIR}/ACE_wrappers" @@ -37,5 +40,3 @@ do_install() { rm -r ${D}/usr/share } - -UPSTREAM_CHECK_URI = "https://github.com/DOCGroup/ACE_TAO/releases" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb index 1f85c46e2f..f4d0c09306 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/gensio/gensio_2.8.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ " -SRCREV = "300644fc02b7099ca27ca5bac88c47e159ba8a6b" +SRCREV = "e4dbb9687bd5e887fa98a4cdcec012ea85da1ef2" SRC_URI = "git://github.com/cminyard/gensio;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb index 44683bf735..693afe6c53 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.10.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/hostapd/hostapd_2.11.bb @@ -2,7 +2,7 @@ SUMMARY = "User space daemon for extended IEEE 802.11 management" HOMEPAGE = "http://w1.fi/hostapd/" SECTION = "kernel/userland" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=aa03b8bd6216d1a7ca01fd4b89863073" +LIC_FILES_CHKSUM = "file://hostapd/README;beginline=5;endline=47;md5=8e2c69e491b28390f9de0df1f64ebd6d" DEPENDS = "libnl openssl" @@ -14,7 +14,7 @@ SRC_URI = " \ " -SRC_URI[sha256sum] = "206e7c799b678572c2e3d12030238784bc4a9f82323b0156b4c9466f1498915d" +SRC_URI[sha256sum] = "2b3facb632fd4f65e32f4bf82a76b4b72c501f995a4f62e330219fe7aed1747a" inherit update-rc.d systemd pkgconfig features_check diff --git a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb index 5b5af30607..95dba3a409 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/irssi/irssi_1.4.5.bb @@ -9,6 +9,7 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BP}.tar.xz SRC_URI[sha256sum] = "72a951cb0ad622785a8962801f005a3a412736c7e7e3ce152f176287c52fe062" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb index 4d993031d3..16d900ddc7 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.18.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/iwd/iwd_2.20.bb @@ -3,12 +3,12 @@ HOMEPAGE = "https://iwd.wiki.kernel.org/" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" -DEPENDS = "ell" +DEPENDS = "dbus" SRC_URI = "https://www.kernel.org/pub/linux/network/wireless/${BP}.tar.xz \ file://0001-build-Use-abs_top_srcdir-instead-of-abs_srcdir-for-e.patch \ " -SRC_URI[sha256sum] = "100d029171d161411f6cd8e1f95708e3a4351fb19e6847ba04819377b5fed13e" +SRC_URI[sha256sum] = "86827b97cb5b19ddecce36568c59378da2fae8cf37a0e2b9eacd1269f24c6f8e" inherit autotools manpages pkgconfig python3native systemd @@ -24,8 +24,6 @@ PACKAGECONFIG[wired] = "--enable-wired,--disable-wired" PACKAGECONFIG[ofono] = "--enable-ofono,--disable-ofono" PACKAGECONFIG[systemd] = "--with-systemd-unitdir=${systemd_system_unitdir},--disable-systemd-service,systemd" -EXTRA_OECONF = "--enable-external-ell" - SYSTEMD_SERVICE:${PN} = " \ iwd.service \ ${@bb.utils.contains('PACKAGECONFIG', 'wired', 'ead.service', '', d)} \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch new file mode 100644 index 0000000000..46eb6aa96c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5/CVE-2024-26458_CVE-2024-26461.patch @@ -0,0 +1,207 @@ +From c5f9c816107f70139de11b38aa02db2f1774ee0d Mon Sep 17 00:00:00 2001 +From: Greg Hudson <ghudson@mit.edu> +Date: Tue, 5 Mar 2024 19:53:07 -0500 +Subject: [PATCH] Fix two unlikely memory leaks + +In gss_krb5int_make_seal_token_v3(), one of the bounds checks (which +could probably never be triggered) leaks plain.data. Fix this leak +and use current practices for cleanup throughout the function. + +In xmt_rmtcallres() (unused within the tree and likely elsewhere), +store port_ptr into crp->port_ptr as soon as it is allocated; +otherwise it could leak if the subsequent xdr_u_int32() operation +fails. + +CVE: CVE-2024-26458 CVE-2024-26461 +Upstream-Status: Backport [https://github.com/krb5/krb5/commit/c5f9c816107f70139de11b38aa02db2f1774ee0d] + +Signed-off-by: Yogita Urade <yogita.urade@windriver.com> +--- + src/lib/gssapi/krb5/k5sealv3.c | 56 +++++++++++++++------------------- + src/lib/rpc/pmap_rmt.c | 9 +++--- + 2 files changed, 29 insertions(+), 36 deletions(-) + +diff --git a/src/lib/gssapi/krb5/k5sealv3.c b/src/lib/gssapi/krb5/k5sealv3.c +index 1fcbdfb..d3210c1 100644 +--- a/src/lib/gssapi/krb5/k5sealv3.c ++++ b/src/lib/gssapi/krb5/k5sealv3.c +@@ -65,7 +65,7 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + int conf_req_flag, int toktype) + { + size_t bufsize = 16; +- unsigned char *outbuf = 0; ++ unsigned char *outbuf = NULL; + krb5_error_code err; + int key_usage; + unsigned char acceptor_flag; +@@ -75,9 +75,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + #endif + size_t ec; + unsigned short tok_id; +- krb5_checksum sum; ++ krb5_checksum sum = { 0 }; + krb5_key key; + krb5_cksumtype cksumtype; ++ krb5_data plain = empty_data(); ++ ++ token->value = NULL; ++ token->length = 0; + + acceptor_flag = ctx->initiate ? 0 : FLAG_SENDER_IS_ACCEPTOR; + key_usage = (toktype == KG_TOK_WRAP_MSG +@@ -107,14 +111,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + #endif + + if (toktype == KG_TOK_WRAP_MSG && conf_req_flag) { +- krb5_data plain; + krb5_enc_data cipher; + size_t ec_max; + size_t encrypt_size; + + /* 300: Adds some slop. */ +- if (SIZE_MAX - 300 < message->length) +- return ENOMEM; ++ if (SIZE_MAX - 300 < message->length) { ++ err = ENOMEM; ++ goto cleanup; ++ } + ec_max = SIZE_MAX - message->length - 300; + if (ec_max > 0xffff) + ec_max = 0xffff; +@@ -126,20 +131,20 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + #endif + err = alloc_data(&plain, message->length + 16 + ec); + if (err) +- return err; ++ goto cleanup; + + /* Get size of ciphertext. */ + encrypt_size = krb5_encrypt_size(plain.length, key->keyblock.enctype); + if (encrypt_size > SIZE_MAX / 2) { + err = ENOMEM; +- goto error; ++ goto cleanup; + } + bufsize = 16 + encrypt_size; + /* Allocate space for header plus encrypted data. */ + outbuf = gssalloc_malloc(bufsize); + if (outbuf == NULL) { +- free(plain.data); +- return ENOMEM; ++ err = ENOMEM; ++ goto cleanup; + } + + /* TOK_ID */ +@@ -164,11 +169,8 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + cipher.ciphertext.length = bufsize - 16; + cipher.enctype = key->keyblock.enctype; + err = krb5_k_encrypt(context, key, key_usage, 0, &plain, &cipher); +- zap(plain.data, plain.length); +- free(plain.data); +- plain.data = 0; + if (err) +- goto error; ++ goto cleanup; + + /* Now that we know we're returning a valid token.... */ + ctx->seq_send++; +@@ -181,7 +183,6 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + /* If the rotate fails, don't worry about it. */ + #endif + } else if (toktype == KG_TOK_WRAP_MSG && !conf_req_flag) { +- krb5_data plain; + size_t cksumsize; + + /* Here, message is the application-supplied data; message2 is +@@ -193,21 +194,19 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + wrap_with_checksum: + err = alloc_data(&plain, message->length + 16); + if (err) +- return err; ++ goto cleanup; + + err = krb5_c_checksum_length(context, cksumtype, &cksumsize); + if (err) +- goto error; ++ goto cleanup; + + assert(cksumsize <= 0xffff); + + bufsize = 16 + message2->length + cksumsize; + outbuf = gssalloc_malloc(bufsize); + if (outbuf == NULL) { +- free(plain.data); +- plain.data = 0; + err = ENOMEM; +- goto error; ++ goto cleanup; + } + + /* TOK_ID */ +@@ -239,23 +238,15 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + if (message2->length) + memcpy(outbuf + 16, message2->value, message2->length); + +- sum.contents = outbuf + 16 + message2->length; +- sum.length = cksumsize; +- + err = krb5_k_make_checksum(context, cksumtype, key, + key_usage, &plain, &sum); +- zap(plain.data, plain.length); +- free(plain.data); +- plain.data = 0; + if (err) { + zap(outbuf,bufsize); +- goto error; ++ goto cleanup; + } + if (sum.length != cksumsize) + abort(); + memcpy(outbuf + 16 + message2->length, sum.contents, cksumsize); +- krb5_free_checksum_contents(context, &sum); +- sum.contents = 0; + /* Now that we know we're actually generating the token... */ + ctx->seq_send++; + +@@ -285,12 +276,13 @@ gss_krb5int_make_seal_token_v3 (krb5_context context, + + token->value = outbuf; + token->length = bufsize; +- return 0; ++ outbuf = NULL; ++ err = 0; + +-error: ++cleanup: ++ krb5_free_checksum_contents(context, &sum); ++ zapfree(plain.data, plain.length); + gssalloc_free(outbuf); +- token->value = NULL; +- token->length = 0; + return err; + } + +diff --git a/src/lib/rpc/pmap_rmt.c b/src/lib/rpc/pmap_rmt.c +index 8c7e30c..522cb20 100644 +--- a/src/lib/rpc/pmap_rmt.c ++++ b/src/lib/rpc/pmap_rmt.c +@@ -160,11 +160,12 @@ xdr_rmtcallres( + caddr_t port_ptr; + + port_ptr = (caddr_t)(void *)crp->port_ptr; +- if (xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), +- xdr_u_int32) && xdr_u_int32(xdrs, &crp->resultslen)) { +- crp->port_ptr = (uint32_t *)(void *)port_ptr; ++ if (!xdr_reference(xdrs, &port_ptr, sizeof (uint32_t), ++ (xdrproc_t)xdr_u_int32)) ++ return (FALSE); ++ crp->port_ptr = (uint32_t *)(void *)port_ptr; ++ if (xdr_u_int32(xdrs, &crp->resultslen)) + return ((*(crp->xdr_results))(xdrs, crp->results_ptr)); +- } + return (FALSE); + } + +-- +2.40.0 diff --git a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb index ed12fee94c..7489181322 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.21.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/krb5/krb5_1.21.3.bb @@ -14,7 +14,7 @@ DESCRIPTION = "Kerberos is a system for authenticating users and services on a n HOMEPAGE = "http://web.mit.edu/Kerberos/" SECTION = "console/network" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=32cb3a99207053d9f5c1ef177c4d6e34" +LIC_FILES_CHKSUM = "file://${S}/../NOTICE;md5=71c06694263581762668e88b7b77a1a5" inherit autotools-brokensep binconfig perlnative systemd update-rc.d pkgconfig @@ -28,9 +28,10 @@ SRC_URI = "http://web.mit.edu/kerberos/dist/${BPN}/${SHRT_VER}/${BP}.tar.gz \ file://etc/default/krb5-admin-server \ file://krb5-kdc.service \ file://krb5-admin-server.service \ + file://CVE-2024-26458_CVE-2024-26461.patch;striplevel=2 \ " -SRC_URI[sha256sum] = "9560941a9d843c0243a71b17a7ac6fe31c7cebb5bce3983db79e52ae7e850491" +SRC_URI[sha256sum] = "b7a4cd5ead67fb08b980b21abd150ff7217e85ea320c9ed0c6dadd304840ad35" CVE_PRODUCT = "kerberos" CVE_VERSION = "5-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb index c9e9c90d7d..8bd555d968 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libimobiledevice-glue/libimobiledevice-glue_1.3.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "http://www.libimobiledevice.org/" DEPENDS = "libplist" -SRCREV = "fde8946a3988790fd5d3f01fc0a1fd43609ab1d1" +SRCREV = "362f7848ac89b74d9dd113b38b51ecb601f76094" SRC_URI = "git://github.com/libimobiledevice/libimobiledevice-glue;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb index 94cbef8fc1..16f82c6ba3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libmtp/libmtp_1.1.21.bb @@ -21,6 +21,9 @@ SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BP}.tar.g SRC_URI:append:class-target = " file://0001-Use-native-mtp-hotplug.patch" SRC_URI[sha256sum] = "f4c1ceb3df020a6cb851110f620c14fe399518c494ed252039cbfb4e34335135" +UPSTREAM_CHECK_URI = "https://github.com/libmtp/libmtp/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + inherit autotools pkgconfig lib_package EXTRA_OECONF += " \ diff --git a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb index 80946317e4..69eecdd9fa 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.8.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/libndp/libndp_1.9.bb @@ -7,7 +7,7 @@ SRC_URI = "git://github.com/jpirko/libndp;branch=master;protocol=https \ file://0001-libndp-Fix-signature-of-sendto-API.patch \ " # tag for v1.8 -SRCREV = "009ce9cd9b950ffa1f4f94c9436027b936850d0c" +SRCREV = "2730638bf88984b09531813974f9bd14e1a50165" S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb index 693ec12d3c..bea22b18e2 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/mosh/mosh_1.4.0.bb @@ -48,3 +48,4 @@ RDEPENDS:${PN}-server += "openssh-sshd" ARM_INSTRUCTION_SET = "arm" CXXFLAGS:append = " -std=c++17" +LDFLAGS:append:riscv32 = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb index 7348274948..7d373a65c6 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obex/openobex_1.7.2.bb @@ -15,6 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}/${PV}/${BP}-Source.tar.gz \ SRC_URI[md5sum] = "f6e0b6cb7dcfd731460a7e9a91429a3a" SRC_URI[sha256sum] = "158860aaea52f0fce0c8e4b64550daaae06df2689e05834697b7e8c7d73dd4fc" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/openobex/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/${BP}-Source" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb index f7a98fb61e..0183659077 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/obexftp/obexftp_0.24.2.bb @@ -14,6 +14,9 @@ SRC_URI = "http://downloads.sourceforge.net/openobex/${BP}-Source.tar.gz \ SRC_URI[md5sum] = "157a9d1b2ed220203f7084db906de73c" SRC_URI[sha256sum] = "d40fb48e0a0eea997b3e582774b29f793919a625d54b87182e31a3f3d1c989a3" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/openobex/files/obexftp/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + inherit cmake pkgconfig OECMAKE_GENERATOR = "Unix Makefiles" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch index fba9a8767f..a881c83495 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp/0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch @@ -13,47 +13,41 @@ Upstream-Status: Pending src/samples/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt -index a9f8908..7eadc60 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt -@@ -11,7 +11,7 @@ export(EXPORT ${package_name} - FILE "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Targets.cmake" - NAMESPACE ${package_name}::) - --install(EXPORT ${package_name} DESTINATION lib/cmake/${package_name} -+install(EXPORT ${package_name} DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} - FILE ${package_name}Targets.cmake - NAMESPACE ${package_name}::) +@@ -34,7 +34,7 @@ export(EXPORT ${package_name} + ) -@@ -19,4 +19,4 @@ install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" - FindPahoMqttC.cmake - "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" -- DESTINATION lib/cmake/${package_name}) -+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name}) -diff --git a/src/samples/CMakeLists.txt b/src/samples/CMakeLists.txt -index 3ca0a75..c915cd5 100644 ---- a/src/samples/CMakeLists.txt -+++ b/src/samples/CMakeLists.txt -@@ -71,7 +71,7 @@ endforeach() + install(EXPORT ${package_name} +- DESTINATION lib/cmake/${package_name} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + FILE ${package_name}Targets.cmake + NAMESPACE ${package_name}:: + ) +@@ -42,5 +42,5 @@ install(EXPORT ${package_name} + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}Config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/${package_name}ConfigVersion.cmake" +- DESTINATION lib/cmake/${package_name} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${package_name} + ) +--- a/examples/CMakeLists.txt ++++ b/examples/CMakeLists.txt +@@ -65,7 +65,7 @@ endforeach() ## install binaries install(TARGETS ${EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} ) ## Build the SSL/TLS samples, if selected -@@ -89,7 +89,7 @@ if(PAHO_WITH_SSL) - endforeach() +@@ -80,7 +80,7 @@ if(PAHO_WITH_SSL) + endforeach() - install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples -- RUNTIME DESTINATION bin -+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - ) + install(TARGETS ${SSL_EXECUTABLES} EXPORT PahoMqttCppSamples +- RUNTIME DESTINATION bin ++ RUNTIME DESTINATION {CMAKE_INSTALL_BINDIR} + ) endif() --- -2.34.1 - diff --git a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb index 1b2e51c3ac..6f2efcda50 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/paho-mqtt-cpp/paho-mqtt-cpp_1.4.1.bb @@ -5,15 +5,16 @@ SECTION = "console/network" LICENSE = "EPL-2.0 | EDL-1.0" LIC_FILES_CHKSUM = " \ - file://src/mqtt/message.h;beginline=9;endline=18;md5=c5ceecf5ab99d44dcfaaabdce289071b \ + file://LICENSE;md5=c0fa3a632eea67f4079c54df781d1441 \ file://edl-v10;md5=3adfcc70f5aeb7a44f3f9b495aa1fbf3 \ file://epl-v20;md5=d9fc0efef5228704e7f5b37f27192723 \ " -SRC_URI = "git://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.3.x \ +SRC_URI = "gitsm://github.com/eclipse/paho.mqtt.cpp;protocol=https;branch=v1.4.x \ file://0001-cmake-Use-CMAKE_INSTALL_LIBDIR-and-CMAKE_INSTALL_BIN.patch \ " -SRCREV = "5e0d1bf37b4826d680ec066ec42afd133851a681" +SRCREV = "ac1b023eab789e829656144f12b248602c40e37b" +PV .= "+git" DEPENDS = "openssl paho-mqtt-c" @@ -21,4 +22,4 @@ S = "${WORKDIR}/git" inherit cmake -EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON" +EXTRA_OECMAKE += "-DPAHO_WITH_SSL=ON -DPAHO_BUILD_EXAMPLES=OFF" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb index b9ed3d925d..199a7c6d6f 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_4.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/transmission/transmission_4.0.6.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://transmissionbt.com/" LICENSE = "MIT & GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=ba8199e739948e198310093de27175fa" -DEPENDS = "curl libevent gnutls openssl libtool intltool-native glib-2.0-native" +DEPENDS = "curl libevent libpsl gnutls openssl libtool intltool-native glib-2.0-native" RDEPENDS:${PN}-web = "${PN}" SRC_URI = " \ @@ -12,13 +12,15 @@ SRC_URI = " \ file://transmission-daemon \ " -# Transmission release 4.0.5 -SRCREV = "a6fe2a64aa7eca089f96006cf082a12f0cde937f" +# Transmission release 4.0.6 +SRCREV = "38c164933e9f77c110b48fe745861c3b98e3d83e" S = "${WORKDIR}/git" inherit cmake gettext update-rc.d pkgconfig systemd mime-xdg +LDFLAGS:append:riscv32 = " -latomic" + PACKAGECONFIG = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb index eda01ca388..c372b03072 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wifi-test-suite/wifi-test-suite_10.10.1.bb @@ -38,3 +38,8 @@ do_install () { } RDEPENDS:${PN} = "wpa-supplicant" + +# http://errors.yoctoproject.org/Errors/Details/766893/ +# wfa_cmdproc.c:467:68: error: passing argument 3 of 'strtok_r' from incompatible pointer type [-Wincompatible-pointer-types] +# wfa_cs.c:4175:57: error: initialization of 'caStaGetEventDetails_t *' {aka 'struct ca_sta_get_event_details *'} from incompatible pointer type 'caStaMngServ_t *' {aka 'struct ca_sta_manage_service *'} [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb index 99e3ccacac..c1da15a1b3 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvdial_1.61.bb @@ -16,6 +16,10 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. SRC_URI[md5sum] = "37e9a2d664effe4efd44c0e1a20136de" SRC_URI[sha256sum] = "99906d9560cbdbc97e1855e7b0a7169f1e11983be3ac539140423f09debced82" +# code.google.com/archive page is generated by javascript from JSON and does not +# allow devtool to find the latest version +UPSTREAM_VERSION_UNKNOWN = "1" + COMPATIBLE_HOST:libc-musl = "null" EXTRA_OEMAKE = "" export WVLINK="${LD}" diff --git a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb index 3453f3e964..3b72e4412c 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/wvdial/wvstreams_4.6.1.bb @@ -28,6 +28,10 @@ SRC_URI = "https://storage.googleapis.com/google-code-archive-downloads/v2/code. SRC_URI[md5sum] = "2760dac31a43d452a19a3147bfde571c" SRC_URI[sha256sum] = "8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633" +# The code.google.com/archive page is generated using Javascript from a JSON file and does not +# allow devtool to find the latest version +UPSTREAM_VERSION_UNKNOWN = "1" + COMPATIBLE_HOST:libc-musl = "null" inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb index 5ae72df862..f90b2cab13 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/czmq_4.2.1.bb @@ -10,6 +10,7 @@ SRC_URI[md5sum] = "471e9ec120fc66a2fe2aae14359e3cfa" SRC_URI[sha256sum] = "5d720a204c2a58645d6f7643af15d563a712dad98c9d32c1ed913377daa6ac39" UPSTREAM_CHECK_URI = "https://github.com/zeromq/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb index 555458217a..7569d3200d 100644 --- a/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb +++ b/meta-openembedded/meta-oe/recipes-connectivity/zeromq/zeromq_4.3.5.bb @@ -13,6 +13,7 @@ SRC_URI = "http://github.com/zeromq/libzmq/releases/download/v${PV}/zeromq-${PV} SRC_URI[sha256sum] = "6653ef5910f17954861fe72332e68b03ca6e4d9c7160eb3a8de5a5a913bfab43" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/libzmq/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+\.\d+\.\d+)" inherit cmake ptest pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb deleted file mode 100644 index e89d1327e8..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "D-Bus wrapper in C++ for dbus" -HOMEPAGE = "https://dbus-cxx.github.io/" -BUGTRACKER = "https://github.com/libsigcplusplus/libsigcplusplus/issues" -SECTION = "base" -LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" - -SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" -SRCREV = "732a5becb4349e02ffce407a3fd4d75cc3d82421" - -DEPENDS = "\ - dbus \ - libsigc++-3 \ -" - -RDEPENDS:${PN} = "\ - dbus \ - libsigc++-3 \ -" - -S = "${WORKDIR}/git" - -inherit pkgconfig cmake - -OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb new file mode 100644 index 0000000000..fbe1e34751 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-core/dbus-cxx/dbus-cxx_2.5.2.bb @@ -0,0 +1,49 @@ +SUMMARY = "D-Bus implementation in C++" +HOMEPAGE = "https://dbus-cxx.github.io/" +BUGTRACKER = "https://github.com/dbus-cxx/dbus-cxx/issues" +SECTION = "base" +LICENSE = "LGPL-3.0-or-later | BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=24594f493407a4cd401ce9794e0b9308" + +SRC_URI = "git://github.com/dbus-cxx/dbus-cxx.git;branch=master;protocol=https" +SRCREV = "f2637e726207ecfbdaaf02744e1b36e54f929c9d" + +DEPENDS = "\ + dbus \ + libsigc++-3 \ +" + +RDEPENDS:${PN} = "\ + dbus \ + libsigc++-3 \ +" + +S = "${WORKDIR}/git" + +inherit pkgconfig cmake + +OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "BOTH" +EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DTOOLS_BUNDLED_CPPGENERATE=OFF" + +PACKAGECONFIG ??= "" +PACKAGECONFIG:class-native ?= "tools" +PACKAGECONFIG:class-nativesdk ?= "tools" + +PACKAGECONFIG[tools] = "-DENABLE_TOOLS=ON,-DENABLE_TOOS=OFF,popt cppgenerate" +PACKAGECONFIG[glib] = "-DENABLE_GLIB_SUPPORT=ON,-DENABLE_GLIB_SUPPORT=OFF,glib-2.0" +PACKAGECONFIG[uv] = "-DENABLE_UV_SUPPORT=ON,-DENABLE_UV_SUPPORT=OFF,libuv" + +PACKAGES =+ " ${PN}-tools ${PN}-glib ${PN}-uv ${PN}-glib-dev ${PN}-uv-dev " +FILES:${PN}-tools = "${bindir}/dbus-cxx-xml2cpp ${bindir}/dbus-cxx-introspect" +FILES:${PN}-glib = "${libdir}/libdbus-cxx-glib.so.* " +FILES:${PN}-glib-dev = "${includedir}/dbus-cxx-glib-2.0/* \ + ${libdir}/pkgconfig/dbus-cxx-glib-2.0.pc \ + ${libdir}/libdbus-cxx-glib.so \ + " +FILES:${PN}-uv = "${libdir}/libdbus-cxx-uv.so.* " +FILES:${PN}-uv-dev = "${includedir}/dbus-cxx-uv-2.0/* \ + ${libdir}/pkgconfig/dbus-cxx-uv-2.0.pc\ + ${libdir}/libdbus-cxx-uv.so \ + " + +BBCLASSEXTEND="native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_32.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_36.bb index 900b5e3ac8..46cff86db9 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_32.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-broker_36.bb @@ -7,9 +7,10 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=7b486c2338d225a1405d979ed2c15ce8" SRC_URI = "https://github.com/bus1/dbus-broker/releases/download/v${PV}/dbus-broker-${PV}.tar.xz" -SRC_URI[sha256sum] = "bea7f653e7251063c5f427e9e3f93562d38a0d8667ae6d49fb56f113605985de" +SRC_URI[sha256sum] = "d333d99bd2688135b6d6961e7ad1360099d186078781c87102230910ea4e162b" UPSTREAM_CHECK_URI = "https://github.com/bus1/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+)" inherit meson pkgconfig systemd features_check diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb index cbe82d42e7..086a37ca1c 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/dbus-daemon-proxy_git.bb @@ -8,6 +8,10 @@ PV = "0.0.0+git" SRC_URI = "git://github.com/alban/dbus-daemon-proxy;branch=master;protocol=https \ file://0001-dbus-daemon-proxy-Return-DBUS_HANDLER_RESULT_NOT_YET.patch \ " + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb index 8e8f544e8e..8940e19f89 100644 --- a/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/dbus/libdbus-c++_0.9.0.bb @@ -18,6 +18,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/dbus-cplusplus/dbus-c++/${PV}/${BP}.tar SRC_URI[md5sum] = "e752116f523fa88ef041e63d3dee4de2" SRC_URI[sha256sum] = "bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dbus-cplusplus/files" +UPSTREAM_CHECK_REGEX = "libdbus-c---(?P<pver>\d+(\.\d+)+)" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-ecore --disable-examples --disable-tests" diff --git a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb index c78dd55ca6..4651938499 100644 --- a/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/glib-2.0/glibmm_2.66.7.bb @@ -12,7 +12,7 @@ inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI[archive.sha256sum] = "b2a4cd7b9ae987794cbb5a1becc10cecb65182b9bb841868625d6bbb123edb1d" +SRC_URI[archive.sha256sum] = "fe02c1e5f5825940d82b56b6ec31a12c06c05c1583cfe62f934d0763e1e542b3" FILES:${PN} = "${libdir}/lib*.so.*" FILES:${PN}-dev += "${datadir}/glibmm-* ${libdir}/glibmm-2.4/include/ ${libdir}/glibmm-2.4/proc/ ${libdir}/giomm-2.4/include/" diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb index b2eb5dd094..ede57bc3ec 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-2.0_2.12.1.bb @@ -8,6 +8,9 @@ DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.12/libsigc++-${PV}.tar.xz" SRC_URI[sha256sum] = "a9dbee323351d109b7aee074a9cb89ca3e7bcf8ad8edef1851f4cf359bd50843" +UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/2.12/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/libsigc++-${PV}" inherit meson diff --git a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb index 0753457c9d..b3875e8436 100644 --- a/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-core/libsigc++-2.0/libsigc++-3_3.6.0.bb @@ -8,6 +8,9 @@ DEPENDS = "mm-common" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/3.6/libsigc++-${PV}.tar.xz" SRC_URI[sha256sum] = "c3d23b37dfd6e39f2e09f091b77b1541fbfa17c4f0b6bf5c89baef7229080e17" +UPSTREAM_CHECK_URI = "https://download.gnome.org/sources/libsigc++/3.6/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/libsigc++-${PV}" inherit setuptools3 meson @@ -15,5 +18,5 @@ inherit setuptools3 meson FILES:${PN}-dev += "${libdir}/sigc++-*/" FILES:${PN}-doc += "${datadir}/devhelp" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" diff --git a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb index ada0199476..0271602555 100644 --- a/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-core/libxml/libxml++-5.0_5.0.1.bb @@ -15,5 +15,7 @@ S = "${WORKDIR}/libxml++-${PV}" SRC_URI[archive.sha256sum] = "15c38307a964fa6199f4da6683a599eb7e63cc89198545b36349b87cf9aa0098" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + FILES:${PN}-doc += "${datadir}/devhelp" FILES:${PN}-dev += "${libdir}/libxml++-${@gnome_verdir("${PV}")}/include/libxml++config.h" diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch deleted file mode 100644 index 4866a5fbe0..0000000000 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common/0001-meson.build-do-not-ask-for-python-installation-versi.patch +++ /dev/null @@ -1,45 +0,0 @@ -From af4069263487399be82ee53d48b1edda7f8e594e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Mon, 4 Nov 2019 19:19:47 +0100 -Subject: [PATCH] meson.build: do not ask for python installation / version -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Even by adding python3-setuptools-native the following error is not fixed so -just ask for python3 executable. - -| meson.build:9:0: ERROR: <ExternalProgram 'python3' -> ['<...>/recipe-sysroot-native/usr/bin/python3-native/python3']> is not a valid python or it is missing setuptools - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -rebase for 1.0.4 -Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> - ---- - meson.build | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/meson.build b/meson.build -index 8a18c36..34fd546 100644 ---- a/meson.build -+++ b/meson.build -@@ -7,12 +7,7 @@ project('mm-common', - # and meson.add_install_script(python3, ...) - ) - --python3 = import('python').find_installation() --python_version = python3.language_version() --python_version_req = '>= 3.5' --if not python_version.version_compare(python_version_req) -- error('Requires Python @0@, found @1@.'.format(python_version_req, python_version)) --endif -+python3 = import('python3').find_python() - - # Use these instead of meson.source_root() and meson.build_root(). - # source_root() and build_root() are not useful, if this is a subproject. --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb index 56f7b5af6f..a252a6b48e 100644 --- a/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-core/mm-common/mm-common_1.0.6.bb @@ -8,10 +8,9 @@ inherit gnomebase # All the recipe does is stage python and shell script, some autotools files; nothing is compiled. inherit allarch -SRC_URI[archive.sha256sum] = "e954c09b4309a7ef93e13b69260acdc5738c907477eb381b78bb1e414ee6dbd8" -SRC_URI += "file://0001-meson.build-do-not-ask-for-python-installation-versi.patch" +SRC_URI[archive.sha256sum] = "b55c46037dbcdabc5cee3b389ea11cc3910adb68ebe883e9477847aa660862e7" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" # These files aren't very usefull on target image, package them all in nnPN-dev FILES:${PN} = "" diff --git a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb index 0bb45b8eaf..fe3cf73e43 100644 --- a/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/musl-rpmatch/musl-rpmatch_git.bb @@ -7,6 +7,9 @@ SRC_URI = "gitsm://github.com/pullmoll/musl-rpmatch.git;protocol=https;branch=ma PV = "1.0+git" SRCREV = "46267b154987d3e1f25d3a75423faa62bb5ee342" +# Upstream repo has not made releases/tags after 1.0 +UPSTREAM_CHECK_COMMITS = "1" + inherit autotools S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb index 7ae0362d37..23007d7cca 100644 --- a/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/opencl/opencl-clhpp_git.bb @@ -21,3 +21,5 @@ EXTRA_OECMAKE = " \ # Headers only so PN is empty RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index bc40f56b99..6f31283fb3 100644 --- a/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-openembedded/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -353,7 +353,6 @@ RDEPENDS:packagegroup-meta-oe-extended ="\ figlet \ libcec \ libdivecomputer \ - fluentbit \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libgxim", "", d)} \ liblognorm \ libmodbus \ @@ -607,12 +606,13 @@ RDEPENDS:packagegroup-meta-oe-graphics ="\ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "tigervnc", "", d)} \ tslib \ unclutter-xfixes \ - libvdpau \ + ${@bb.utils.contains("DISTRO_FEATURES", "x11", "libvdpau vdpauinfo", "", d)} \ xcursorgen \ ${@bb.utils.contains("DISTRO_FEATURES", "x11 pam", "xscreensaver", "", d)} \ yad \ ydotool \ parallel-deqp-runner \ + deqp-runner \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl", "opengl-es-cts", "", d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "opengl vulkan", "vulkan-cts", "", d)} \ " @@ -811,13 +811,11 @@ RDEPENDS:packagegroup-meta-oe-support ="\ libcanberra \ libssh \ libssh2 \ - libee \ libusbgx-config \ libusbgx \ lockdev \ logwarn \ libjs-sizzle \ - liblinebreak \ mailcap \ liboauth \ mg \ @@ -972,7 +970,6 @@ RDEPENDS:packagegroup-meta-oe-ptest-packages = "\ oprofile-ptest \ libteam-ptest \ uthash-ptest \ - libee-ptest \ poco-ptest \ cmocka-ptest \ minicoredumper-ptest \ diff --git a/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb b/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb index 80e3cc6298..8fc8749a1f 100644 --- a/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb +++ b/meta-openembedded/meta-oe/recipes-core/pim435/pim435_git.bb @@ -11,6 +11,10 @@ LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=7dda4e90ded66ab88b86f76169f28663 SRC_URI = "git://gitlab.eclipse.org/eclipse/oniro-blueprints/core/pim435;protocol=https;branch=main" SRCREV = "445ed623ec8d3ecbb1d566900b4ef3fb3031d689" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" DEPENDS = "i2c-tools" diff --git a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb index 86a2331bd3..28213f387c 100644 --- a/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb +++ b/meta-openembedded/meta-oe/recipes-core/proxy-libintl/proxy-libintl_20100902.bb @@ -12,6 +12,8 @@ SRC_URI = " \ SRC_URI[md5sum] = "aef407c2b97ee829383aadd867c61d1e" SRC_URI[sha256sum] = "291ac350cc5eb4a01b0d651ca99fae64cee8a1c06b2005277fab5a4356f9ae91" +UPSTREAM_CHECK_REGEX = "${BPN}-dev_(?P<pver>\d+)_win32\.zip" + PACKAGES = "${PN} ${PN}-dev" FILES:${PN}-dev = "${includedir}/libintl.h ${libdir}/libintl.a" INSANE_SKIP:${PN}-dev = "staticdev" diff --git a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb index 882ac2c2ff..e8b4a7fef9 100644 --- a/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb +++ b/meta-openembedded/meta-oe/recipes-core/usleep/usleep_1.2.bb @@ -32,3 +32,7 @@ ALTERNATIVE_LINK_NAME[usleep] = "${base_bindir}/usleep" ALTERNATIVE:${PN}-doc = "usleep.1" ALTERNATIVE_LINK_NAME[usleep.1] = "${mandir}/man1/usleep.1" + +# http://errors.yoctoproject.org/Errors/Details/766900/ +# usleep.c:47:43: error: passing argument 3 of 'poptGetContext' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc index 3a5bee7cee..e5bde3d041 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils-crates.inc @@ -3,10 +3,12 @@ # from Cargo.lock SRC_URI += " \ crate://crates.io/adler/1.0.2 \ - crate://crates.io/ahash/0.7.8 \ + crate://crates.io/ahash/0.8.11 \ crate://crates.io/aho-corasick/1.0.4 \ + crate://crates.io/allocator-api2/0.2.18 \ crate://crates.io/android-tzdata/0.1.1 \ crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/ansi-width/0.1.0 \ crate://crates.io/anstream/0.5.0 \ crate://crates.io/anstyle/1.0.0 \ crate://crates.io/anstyle-parse/0.2.0 \ @@ -16,11 +18,12 @@ SRC_URI += " \ crate://crates.io/arrayref/0.3.6 \ crate://crates.io/arrayvec/0.7.4 \ crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/bigdecimal/0.4.0 \ + crate://crates.io/bigdecimal/0.4.5 \ crate://crates.io/binary-heap-plus/0.5.0 \ - crate://crates.io/bindgen/0.63.0 \ + crate://crates.io/bincode/1.3.3 \ + crate://crates.io/bindgen/0.69.4 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bitflags/2.4.2 \ + crate://crates.io/bitflags/2.5.0 \ crate://crates.io/bitvec/1.0.1 \ crate://crates.io/blake2b_simd/1.0.2 \ crate://crates.io/blake3/1.5.1 \ @@ -63,18 +66,21 @@ SRC_URI += " \ crate://crates.io/crunchy/0.2.2 \ crate://crates.io/crypto-common/0.1.6 \ crate://crates.io/ctrlc/3.4.4 \ - crate://crates.io/data-encoding/2.5.0 \ - crate://crates.io/data-encoding-macro/0.1.14 \ - crate://crates.io/data-encoding-macro-internal/0.1.12 \ + crate://crates.io/data-encoding/2.6.0 \ + crate://crates.io/data-encoding-macro/0.1.15 \ + crate://crates.io/data-encoding-macro-internal/0.1.13 \ + crate://crates.io/deranged/0.3.11 \ crate://crates.io/derive_arbitrary/1.3.2 \ crate://crates.io/diff/0.1.13 \ crate://crates.io/digest/0.10.7 \ + crate://crates.io/displaydoc/0.2.4 \ crate://crates.io/dlv-list/0.5.0 \ crate://crates.io/dns-lookup/2.0.4 \ crate://crates.io/dunce/1.0.4 \ crate://crates.io/either/1.8.0 \ crate://crates.io/encode_unicode/0.3.6 \ crate://crates.io/env_logger/0.8.4 \ + crate://crates.io/equivalent/1.0.1 \ crate://crates.io/errno/0.3.8 \ crate://crates.io/exacl/0.12.0 \ crate://crates.io/fastrand/2.0.1 \ @@ -85,7 +91,7 @@ SRC_URI += " \ crate://crates.io/fnv/1.0.7 \ crate://crates.io/fs_extra/1.3.0 \ crate://crates.io/fsevent-sys/4.1.0 \ - crate://crates.io/fts-sys/0.2.4 \ + crate://crates.io/fts-sys/0.2.9 \ crate://crates.io/fundu/2.0.0 \ crate://crates.io/fundu-core/0.3.0 \ crate://crates.io/funty/2.0.0 \ @@ -103,8 +109,7 @@ SRC_URI += " \ crate://crates.io/generic-array/0.14.6 \ crate://crates.io/getrandom/0.2.9 \ crate://crates.io/glob/0.3.1 \ - crate://crates.io/half/2.4.0 \ - crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/half/2.4.1 \ crate://crates.io/hashbrown/0.14.3 \ crate://crates.io/hermit-abi/0.3.2 \ crate://crates.io/hex/0.4.3 \ @@ -112,11 +117,14 @@ SRC_URI += " \ crate://crates.io/hostname/0.4.0 \ crate://crates.io/iana-time-zone/0.1.53 \ crate://crates.io/iana-time-zone-haiku/0.1.2 \ - crate://crates.io/indicatif/0.17.3 \ + crate://crates.io/indexmap/2.2.6 \ + crate://crates.io/indicatif/0.17.8 \ crate://crates.io/inotify/0.9.6 \ crate://crates.io/inotify-sys/0.1.5 \ + crate://crates.io/instant/0.1.12 \ crate://crates.io/io-lifetimes/1.0.11 \ crate://crates.io/itertools/0.12.1 \ + crate://crates.io/itertools/0.13.0 \ crate://crates.io/itoa/1.0.4 \ crate://crates.io/js-sys/0.3.64 \ crate://crates.io/keccak/0.1.4 \ @@ -124,18 +132,18 @@ SRC_URI += " \ crate://crates.io/kqueue-sys/1.0.3 \ crate://crates.io/lazy_static/1.4.0 \ crate://crates.io/lazycell/1.3.0 \ - crate://crates.io/libc/0.2.153 \ + crate://crates.io/libc/0.2.155 \ crate://crates.io/libloading/0.7.4 \ crate://crates.io/libm/0.2.7 \ crate://crates.io/linux-raw-sys/0.3.8 \ crate://crates.io/linux-raw-sys/0.4.12 \ crate://crates.io/lock_api/0.4.9 \ crate://crates.io/log/0.4.20 \ - crate://crates.io/lru/0.7.8 \ + crate://crates.io/lru/0.12.3 \ crate://crates.io/lscolors/0.16.0 \ crate://crates.io/md-5/0.10.6 \ - crate://crates.io/memchr/2.7.1 \ - crate://crates.io/memmap2/0.9.0 \ + crate://crates.io/memchr/2.7.4 \ + crate://crates.io/memmap2/0.9.4 \ crate://crates.io/minimal-lexical/0.2.1 \ crate://crates.io/miniz_oxide/0.7.2 \ crate://crates.io/mio/0.8.11 \ @@ -143,11 +151,12 @@ SRC_URI += " \ crate://crates.io/nom/7.1.3 \ crate://crates.io/notify/6.0.1 \ crate://crates.io/nu-ansi-term/0.49.0 \ - crate://crates.io/num-bigint/0.4.4 \ - crate://crates.io/num-integer/0.1.45 \ + crate://crates.io/num-bigint/0.4.5 \ + crate://crates.io/num-conv/0.1.0 \ + crate://crates.io/num-integer/0.1.46 \ crate://crates.io/num-modular/0.5.1 \ - crate://crates.io/num-prime/0.4.3 \ - crate://crates.io/num-traits/0.2.18 \ + crate://crates.io/num-prime/0.4.4 \ + crate://crates.io/num-traits/0.2.19 \ crate://crates.io/num_threads/0.1.6 \ crate://crates.io/number_prefix/0.4.0 \ crate://crates.io/once_cell/1.19.0 \ @@ -157,8 +166,7 @@ SRC_URI += " \ crate://crates.io/os_display/0.1.3 \ crate://crates.io/parking_lot/0.12.1 \ crate://crates.io/parking_lot_core/0.9.9 \ - crate://crates.io/parse_datetime/0.5.0 \ - crate://crates.io/peeking_take_while/0.1.2 \ + crate://crates.io/parse_datetime/0.6.0 \ crate://crates.io/phf/0.11.2 \ crate://crates.io/phf_codegen/0.11.2 \ crate://crates.io/phf_generator/0.11.1 \ @@ -167,15 +175,18 @@ SRC_URI += " \ crate://crates.io/pin-utils/0.1.0 \ crate://crates.io/pkg-config/0.3.26 \ crate://crates.io/platform-info/2.0.3 \ - crate://crates.io/portable-atomic/0.3.15 \ + crate://crates.io/portable-atomic/1.6.0 \ + crate://crates.io/powerfmt/0.2.0 \ crate://crates.io/ppv-lite86/0.2.17 \ crate://crates.io/pretty_assertions/1.4.0 \ - crate://crates.io/proc-macro2/1.0.63 \ + crate://crates.io/prettyplease/0.2.19 \ + crate://crates.io/proc-macro-crate/3.1.0 \ + crate://crates.io/proc-macro2/1.0.86 \ crate://crates.io/procfs/0.16.0 \ crate://crates.io/procfs-core/0.16.0 \ crate://crates.io/quick-error/2.0.1 \ crate://crates.io/quickcheck/1.0.3 \ - crate://crates.io/quote/1.0.29 \ + crate://crates.io/quote/1.0.36 \ crate://crates.io/radium/0.7.0 \ crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.3.1 \ @@ -184,16 +195,16 @@ SRC_URI += " \ crate://crates.io/rayon/1.10.0 \ crate://crates.io/rayon-core/1.12.1 \ crate://crates.io/redox_syscall/0.4.1 \ - crate://crates.io/redox_syscall/0.5.0 \ + crate://crates.io/redox_syscall/0.5.2 \ crate://crates.io/reference-counted-singleton/0.1.2 \ - crate://crates.io/regex/1.10.4 \ + crate://crates.io/regex/1.10.5 \ crate://crates.io/regex-automata/0.4.4 \ crate://crates.io/regex-syntax/0.8.2 \ crate://crates.io/relative-path/1.8.0 \ crate://crates.io/rlimit/0.10.1 \ crate://crates.io/roff/0.2.1 \ - crate://crates.io/rstest/0.19.0 \ - crate://crates.io/rstest_macros/0.19.0 \ + crate://crates.io/rstest/0.21.0 \ + crate://crates.io/rstest_macros/0.21.0 \ crate://crates.io/rust-ini/0.21.0 \ crate://crates.io/rustc-hash/1.1.0 \ crate://crates.io/rustc_version/0.4.0 \ @@ -201,12 +212,13 @@ SRC_URI += " \ crate://crates.io/rustix/0.38.31 \ crate://crates.io/same-file/1.0.6 \ crate://crates.io/scopeguard/1.2.0 \ - crate://crates.io/self_cell/1.0.3 \ - crate://crates.io/selinux/0.4.0 \ - crate://crates.io/selinux-sys/0.6.2 \ + crate://crates.io/self_cell/1.0.4 \ + crate://crates.io/selinux/0.4.4 \ + crate://crates.io/selinux-sys/0.6.9 \ crate://crates.io/semver/1.0.14 \ - crate://crates.io/serde/1.0.193 \ - crate://crates.io/serde_derive/1.0.193 \ + crate://crates.io/serde/1.0.203 \ + crate://crates.io/serde-big-array/0.5.1 \ + crate://crates.io/serde_derive/1.0.203 \ crate://crates.io/sha1/0.10.6 \ crate://crates.io/sha2/0.10.8 \ crate://crates.io/sha3/0.10.8 \ @@ -217,34 +229,36 @@ SRC_URI += " \ crate://crates.io/siphasher/0.3.10 \ crate://crates.io/slab/0.4.7 \ crate://crates.io/sm3/0.4.2 \ - crate://crates.io/smallvec/1.13.1 \ + crate://crates.io/smallvec/1.13.2 \ crate://crates.io/smawk/0.3.1 \ crate://crates.io/socket2/0.5.3 \ crate://crates.io/strsim/0.10.0 \ crate://crates.io/syn/1.0.109 \ - crate://crates.io/syn/2.0.32 \ + crate://crates.io/syn/2.0.60 \ crate://crates.io/tap/1.0.1 \ crate://crates.io/tempfile/3.10.1 \ crate://crates.io/terminal_size/0.2.6 \ crate://crates.io/terminal_size/0.3.0 \ crate://crates.io/textwrap/0.16.1 \ - crate://crates.io/thiserror/1.0.37 \ - crate://crates.io/thiserror-impl/1.0.37 \ - crate://crates.io/time/0.3.20 \ - crate://crates.io/time-core/0.1.0 \ - crate://crates.io/time-macros/0.2.8 \ + crate://crates.io/thiserror/1.0.61 \ + crate://crates.io/thiserror-impl/1.0.61 \ + crate://crates.io/time/0.3.36 \ + crate://crates.io/time-core/0.1.2 \ + crate://crates.io/time-macros/0.2.18 \ crate://crates.io/tiny-keccak/2.0.2 \ + crate://crates.io/toml_datetime/0.6.6 \ + crate://crates.io/toml_edit/0.21.1 \ crate://crates.io/trim-in-place/0.1.7 \ crate://crates.io/typenum/1.15.0 \ crate://crates.io/unicode-ident/1.0.5 \ crate://crates.io/unicode-linebreak/0.1.5 \ crate://crates.io/unicode-segmentation/1.11.0 \ - crate://crates.io/unicode-width/0.1.11 \ + crate://crates.io/unicode-width/0.1.12 \ crate://crates.io/unicode-xid/0.2.4 \ - crate://crates.io/unindent/0.2.1 \ + crate://crates.io/unindent/0.2.3 \ crate://crates.io/utf8parse/0.2.1 \ crate://crates.io/uuid/1.7.0 \ - crate://crates.io/uutils_term_grid/0.3.0 \ + crate://crates.io/uutils_term_grid/0.6.0 \ crate://crates.io/version_check/0.9.4 \ crate://crates.io/walkdir/2.5.0 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ @@ -288,18 +302,23 @@ SRC_URI += " \ crate://crates.io/windows_x86_64_msvc/0.42.2 \ crate://crates.io/windows_x86_64_msvc/0.48.0 \ crate://crates.io/windows_x86_64_msvc/0.52.0 \ + crate://crates.io/winnow/0.5.40 \ crate://crates.io/wyz/0.5.1 \ crate://crates.io/xattr/1.3.1 \ crate://crates.io/yansi/0.5.1 \ crate://crates.io/z85/3.0.5 \ - crate://crates.io/zip/1.1.1 \ + crate://crates.io/zerocopy/0.7.33 \ + crate://crates.io/zerocopy-derive/0.7.33 \ + crate://crates.io/zip/1.3.0 \ " SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -SRC_URI[ahash-0.7.8.sha256sum] = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" +SRC_URI[ahash-0.8.11.sha256sum] = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" SRC_URI[aho-corasick-1.0.4.sha256sum] = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a" +SRC_URI[allocator-api2-0.2.18.sha256sum] = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +SRC_URI[ansi-width-0.1.0.sha256sum] = "219e3ce6f2611d83b51ec2098a12702112c29e57203a6b0a0929b2cddb486608" SRC_URI[anstream-0.5.0.sha256sum] = "b1f58811cfac344940f1a400b6e6231ce35171f614f26439e80f8c1465c5cc0c" SRC_URI[anstyle-1.0.0.sha256sum] = "41ed9a86bf92ae6580e0a31281f65a1b1d867c0cc68d5346e2ae128dddfa6a7d" SRC_URI[anstyle-parse-0.2.0.sha256sum] = "e765fd216e48e067936442276d1d57399e37bce53c264d6fefbe298080cb57ee" @@ -309,11 +328,12 @@ SRC_URI[arbitrary-1.3.2.sha256sum] = "7d5a26814d8dcb93b0e5a0ff3c6d80a8843bafb21b SRC_URI[arrayref-0.3.6.sha256sum] = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" SRC_URI[arrayvec-0.7.4.sha256sum] = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -SRC_URI[bigdecimal-0.4.0.sha256sum] = "5274a6b6e0ee020148397245b973e30163b7bffbc6d473613f850cb99888581e" +SRC_URI[bigdecimal-0.4.5.sha256sum] = "51d712318a27c7150326677b321a5fa91b55f6d9034ffd67f20319e147d40cee" SRC_URI[binary-heap-plus-0.5.0.sha256sum] = "e4551d8382e911ecc0d0f0ffb602777988669be09447d536ff4388d1def11296" -SRC_URI[bindgen-0.63.0.sha256sum] = "36d860121800b2a9a94f9b5604b332d5cffb234ce17609ea479d723dbc9d3885" +SRC_URI[bincode-1.3.3.sha256sum] = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad" +SRC_URI[bindgen-0.69.4.sha256sum] = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +SRC_URI[bitflags-2.5.0.sha256sum] = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" SRC_URI[blake2b_simd-1.0.2.sha256sum] = "23285ad32269793932e830392f2fe2f83e26488fd3ec778883a93c8323735780" SRC_URI[blake3-1.5.1.sha256sum] = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52" @@ -356,18 +376,21 @@ SRC_URI[crossterm_winapi-0.9.1.sha256sum] = "acdd7c62a3665c7f6830a51635d9ac9b23e SRC_URI[crunchy-0.2.2.sha256sum] = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" SRC_URI[crypto-common-0.1.6.sha256sum] = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" SRC_URI[ctrlc-3.4.4.sha256sum] = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" -SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" -SRC_URI[data-encoding-macro-0.1.14.sha256sum] = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e" -SRC_URI[data-encoding-macro-internal-0.1.12.sha256sum] = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3" +SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" +SRC_URI[data-encoding-macro-0.1.15.sha256sum] = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639" +SRC_URI[data-encoding-macro-internal-0.1.13.sha256sum] = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f" +SRC_URI[deranged-0.3.11.sha256sum] = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" SRC_URI[derive_arbitrary-1.3.2.sha256sum] = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" SRC_URI[diff-0.1.13.sha256sum] = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" SRC_URI[digest-0.10.7.sha256sum] = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +SRC_URI[displaydoc-0.2.4.sha256sum] = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d" SRC_URI[dlv-list-0.5.0.sha256sum] = "d529fd73d344663edfd598ccb3f344e46034db51ebd103518eae34338248ad73" SRC_URI[dns-lookup-2.0.4.sha256sum] = "e5766087c2235fec47fafa4cfecc81e494ee679d0fd4a59887ea0919bfb0e4fc" SRC_URI[dunce-1.0.4.sha256sum] = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b" SRC_URI[either-1.8.0.sha256sum] = "90e5c1c8368803113bf0c9584fc495a58b86dc8a29edbf8fe877d21d9507e797" SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" +SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" SRC_URI[exacl-0.12.0.sha256sum] = "22be12de19decddab85d09f251ec8363f060ccb22ec9c81bc157c0c8433946d8" SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" @@ -378,7 +401,7 @@ SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fad SRC_URI[fnv-1.0.7.sha256sum] = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" SRC_URI[fs_extra-1.3.0.sha256sum] = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" SRC_URI[fsevent-sys-4.1.0.sha256sum] = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -SRC_URI[fts-sys-0.2.4.sha256sum] = "9a66c0a21e344f20c87b4ca12643cf4f40a7018f132c98d344e989b959f49dd1" +SRC_URI[fts-sys-0.2.9.sha256sum] = "4e184d5f593d19793f26afb6f9a58d25f0bc755c4e48890ffcba6db416153ebb" SRC_URI[fundu-2.0.0.sha256sum] = "6c04cb831a8dccadfe3774b07cba4574a1ec24974d761510e65d8a543c2d7cb4" SRC_URI[fundu-core-0.3.0.sha256sum] = "76a889e633afd839fb5b04fe53adfd588cefe518e71ec8d3c929698c6daf2acd" SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" @@ -396,8 +419,7 @@ SRC_URI[gcd-2.3.0.sha256sum] = "1d758ba1b47b00caf47f24925c0074ecb20d6dfcffe7f6d5 SRC_URI[generic-array-0.14.6.sha256sum] = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9" SRC_URI[getrandom-0.2.9.sha256sum] = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" SRC_URI[glob-0.3.1.sha256sum] = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" -SRC_URI[half-2.4.0.sha256sum] = "b5eceaaeec696539ddaf7b333340f1af35a5aa87ae3e4f3ead0532f72affab2e" -SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[half-2.4.1.sha256sum] = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" @@ -405,11 +427,14 @@ SRC_URI[hex-literal-0.4.1.sha256sum] = "6fe2267d4ed49bc07b63801559be28c718ea06c4 SRC_URI[hostname-0.4.0.sha256sum] = "f9c7c7c8ac16c798734b8a24560c1362120597c40d5e1459f09498f8f6c8f2ba" SRC_URI[iana-time-zone-0.1.53.sha256sum] = "64c122667b287044802d6ce17ee2ddf13207ed924c712de9a66a5814d5b64765" SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -SRC_URI[indicatif-0.17.3.sha256sum] = "cef509aa9bc73864d6756f0d34d35504af3cf0844373afe9b8669a5b8005a729" +SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" SRC_URI[inotify-0.9.6.sha256sum] = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" SRC_URI[inotify-sys-0.1.5.sha256sum] = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" SRC_URI[io-lifetimes-1.0.11.sha256sum] = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" SRC_URI[itertools-0.12.1.sha256sum] = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +SRC_URI[itertools-0.13.0.sha256sum] = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" SRC_URI[itoa-1.0.4.sha256sum] = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" SRC_URI[keccak-0.1.4.sha256sum] = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940" @@ -417,18 +442,18 @@ SRC_URI[kqueue-1.0.7.sha256sum] = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78 SRC_URI[kqueue-sys-1.0.3.sha256sum] = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" SRC_URI[lazycell-1.3.0.sha256sum] = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" -SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" SRC_URI[libloading-0.7.4.sha256sum] = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" SRC_URI[libm-0.2.7.sha256sum] = "f7012b1bbb0719e1097c47611d3898568c546d597c2e74d66f6087edd5233ff4" SRC_URI[linux-raw-sys-0.3.8.sha256sum] = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" SRC_URI[linux-raw-sys-0.4.12.sha256sum] = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456" SRC_URI[lock_api-0.4.9.sha256sum] = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df" SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -SRC_URI[lru-0.7.8.sha256sum] = "e999beba7b6e8345721bd280141ed958096a2e4abdf74f67ff4ce49b4b54e47a" +SRC_URI[lru-0.12.3.sha256sum] = "d3262e75e648fce39813cb56ac41f3c3e3f65217ebf3844d818d1f9398cfb0dc" SRC_URI[lscolors-0.16.0.sha256sum] = "ab0b209ec3976527806024406fe765474b9a1750a0ed4b8f0372364741f50e7b" SRC_URI[md-5-0.10.6.sha256sum] = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" -SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" -SRC_URI[memmap2-0.9.0.sha256sum] = "deaba38d7abf1d4cca21cc89e932e542ba2b9258664d2a9ef0e61512039c9375" +SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +SRC_URI[memmap2-0.9.4.sha256sum] = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322" SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" SRC_URI[mio-0.8.11.sha256sum] = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" @@ -436,11 +461,12 @@ SRC_URI[nix-0.28.0.sha256sum] = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a97 SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" SRC_URI[notify-6.0.1.sha256sum] = "5738a2795d57ea20abec2d6d76c6081186709c0024187cd5977265eda6598b51" SRC_URI[nu-ansi-term-0.49.0.sha256sum] = "c073d3c1930d0751774acf49e66653acecb416c3a54c6ec095a9b11caddb5a68" -SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +SRC_URI[num-bigint-0.4.5.sha256sum] = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7" +SRC_URI[num-conv-0.1.0.sha256sum] = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" +SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" SRC_URI[num-modular-0.5.1.sha256sum] = "64a5fe11d4135c3bcdf3a95b18b194afa9608a5f6ff034f5d857bc9a27fb0119" -SRC_URI[num-prime-0.4.3.sha256sum] = "5f4e3bc495f6e95bc15a6c0c55ac00421504a5a43d09e3cc455d1fea7015581d" -SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +SRC_URI[num-prime-0.4.4.sha256sum] = "e238432a7881ec7164503ccc516c014bf009be7984cde1ba56837862543bdec3" +SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" SRC_URI[num_threads-0.1.6.sha256sum] = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44" SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" @@ -450,8 +476,7 @@ SRC_URI[ordered-multimap-0.7.3.sha256sum] = "49203cdcae0030493bad186b28da2fa2564 SRC_URI[os_display-0.1.3.sha256sum] = "7a6229bad892b46b0dcfaaeb18ad0d2e56400f5aaea05b768bde96e73676cf75" SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" SRC_URI[parking_lot_core-0.9.9.sha256sum] = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" -SRC_URI[parse_datetime-0.5.0.sha256sum] = "3bbf4e25b13841080e018a1e666358adfe5e39b6d353f986ca5091c210b586a1" -SRC_URI[peeking_take_while-0.1.2.sha256sum] = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +SRC_URI[parse_datetime-0.6.0.sha256sum] = "a8720474e3dd4af20cea8716703498b9f3b690f318fa9d9d9e2e38eaf44b96d0" SRC_URI[phf-0.11.2.sha256sum] = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" SRC_URI[phf_codegen-0.11.2.sha256sum] = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" SRC_URI[phf_generator-0.11.1.sha256sum] = "b1181c94580fa345f50f19d738aaa39c0ed30a600d95cb2d3e23f94266f14fbf" @@ -460,15 +485,18 @@ SRC_URI[pin-project-lite-0.2.9.sha256sum] = "e0a7ae3ac2f1173085d398531c705756c94 SRC_URI[pin-utils-0.1.0.sha256sum] = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" SRC_URI[pkg-config-0.3.26.sha256sum] = "6ac9a59f73473f1b8d852421e59e64809f025994837ef743615c6d0c5b305160" SRC_URI[platform-info-2.0.3.sha256sum] = "d5ff316b9c4642feda973c18f0decd6c8b0919d4722566f6e4337cce0dd88217" -SRC_URI[portable-atomic-0.3.15.sha256sum] = "15eb2c6e362923af47e13c23ca5afb859e83d54452c55b0b9ac763b8f7c1ac16" +SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +SRC_URI[powerfmt-0.2.0.sha256sum] = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" SRC_URI[pretty_assertions-1.4.0.sha256sum] = "af7cee1a6c8a5b9208b3cb1061f10c0cb689087b3d8ce85fb9d2dd7a29b6ba66" -SRC_URI[proc-macro2-1.0.63.sha256sum] = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +SRC_URI[prettyplease-0.2.19.sha256sum] = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550" +SRC_URI[proc-macro-crate-3.1.0.sha256sum] = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284" +SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" SRC_URI[procfs-0.16.0.sha256sum] = "731e0d9356b0c25f16f33b5be79b1c57b562f141ebfcdb0ad8ac2c13a24293b4" SRC_URI[procfs-core-0.16.0.sha256sum] = "2d3554923a69f4ce04c4a754260c338f505ce22642d3830e049a399fc2059a29" SRC_URI[quick-error-2.0.1.sha256sum] = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" -SRC_URI[quote-1.0.29.sha256sum] = "573015e8ab27661678357f27dc26460738fd2b6c86e46f386fde94cb5d913105" +SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" @@ -477,16 +505,16 @@ SRC_URI[rand_pcg-0.3.1.sha256sum] = "59cad018caf63deb318e5a4586d99a24424a364f40f SRC_URI[rayon-1.10.0.sha256sum] = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" SRC_URI[rayon-core-1.12.1.sha256sum] = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" SRC_URI[redox_syscall-0.4.1.sha256sum] = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -SRC_URI[redox_syscall-0.5.0.sha256sum] = "13c178f952cc7eac391f3124bd9851d1ac0bdbc4c9de2d892ccd5f0d8b160e96" +SRC_URI[redox_syscall-0.5.2.sha256sum] = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd" SRC_URI[reference-counted-singleton-0.1.2.sha256sum] = "f1bfbf25d7eb88ddcbb1ec3d755d0634da8f7657b2cb8b74089121409ab8228f" -SRC_URI[regex-1.10.4.sha256sum] = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" +SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" SRC_URI[regex-automata-0.4.4.sha256sum] = "3b7fa1134405e2ec9353fd416b17f8dacd46c473d7d3fd1cf202706a14eb792a" SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" SRC_URI[relative-path-1.8.0.sha256sum] = "4bf2521270932c3c7bed1a59151222bd7643c79310f2916f01925e1e16255698" SRC_URI[rlimit-0.10.1.sha256sum] = "3560f70f30a0f16d11d01ed078a07740fe6b489667abc7c7b029155d9f21c3d8" SRC_URI[roff-0.2.1.sha256sum] = "b833d8d034ea094b1ea68aa6d5c740e0d04bad9d16568d08ba6f76823a114316" -SRC_URI[rstest-0.19.0.sha256sum] = "9d5316d2a1479eeef1ea21e7f9ddc67c191d497abc8fc3ba2467857abbb68330" -SRC_URI[rstest_macros-0.19.0.sha256sum] = "04a9df72cc1f67020b0d63ad9bfe4a323e459ea7eb68e03bd9824db49f9a4c25" +SRC_URI[rstest-0.21.0.sha256sum] = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682" +SRC_URI[rstest_macros-0.21.0.sha256sum] = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d" SRC_URI[rust-ini-0.21.0.sha256sum] = "0d625ed57d8f49af6cfa514c42e1a71fadcff60eb0b1c517ff82fe41aa025b41" SRC_URI[rustc-hash-1.1.0.sha256sum] = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" @@ -494,12 +522,13 @@ SRC_URI[rustix-0.37.26.sha256sum] = "84f3f8f960ed3b5a59055428714943298bf3fa2d4a1 SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -SRC_URI[self_cell-1.0.3.sha256sum] = "58bf37232d3bb9a2c4e641ca2a11d83b5062066f88df7fed36c28772046d65ba" -SRC_URI[selinux-0.4.0.sha256sum] = "a00576725d21b588213fbd4af84cd7e4cc4304e8e9bd6c0f5a1498a3e2ca6a51" -SRC_URI[selinux-sys-0.6.2.sha256sum] = "806d381649bb85347189d2350728817418138d11d738e2482cb644ec7f3c755d" +SRC_URI[self_cell-1.0.4.sha256sum] = "d369a96f978623eb3dc28807c4852d6cc617fed53da5d3c400feff1ef34a714a" +SRC_URI[selinux-0.4.4.sha256sum] = "53371b1e9bbbfffd65e5ac3c895c786ec35b7695bdc4a67a8b08c29c8d057e0b" +SRC_URI[selinux-sys-0.6.9.sha256sum] = "89d45498373dc17ec8ebb72e1fd320c015647b0157fc81dddf678e2e00205fec" SRC_URI[semver-1.0.14.sha256sum] = "e25dfac463d778e353db5be2449d1cce89bd6fd23c9f1ea21310ce6e5a1b29c4" -SRC_URI[serde-1.0.193.sha256sum] = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89" -SRC_URI[serde_derive-1.0.193.sha256sum] = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3" +SRC_URI[serde-1.0.203.sha256sum] = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +SRC_URI[serde-big-array-0.5.1.sha256sum] = "11fc7cc2c76d73e0f27ee52abbd64eec84d46f370c88371120433196934e4b7f" +SRC_URI[serde_derive-1.0.203.sha256sum] = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" SRC_URI[sha1-0.10.6.sha256sum] = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" SRC_URI[sha2-0.10.8.sha256sum] = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" SRC_URI[sha3-0.10.8.sha256sum] = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60" @@ -510,34 +539,36 @@ SRC_URI[signal-hook-registry-1.4.1.sha256sum] = "d8229b473baa5980ac72ef434c4415e SRC_URI[siphasher-0.3.10.sha256sum] = "7bd3e3206899af3f8b12af284fafc038cc1dc2b41d1b89dd17297221c5d225de" SRC_URI[slab-0.4.7.sha256sum] = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef" SRC_URI[sm3-0.4.2.sha256sum] = "ebb9a3b702d0a7e33bc4d85a14456633d2b165c2ad839c5fd9a8417c1ab15860" -SRC_URI[smallvec-1.13.1.sha256sum] = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" SRC_URI[smawk-0.3.1.sha256sum] = "f67ad224767faa3c7d8b6d91985b78e70a1324408abcb1cfcc2be4c06bc06043" SRC_URI[socket2-0.5.3.sha256sum] = "2538b18701741680e0322a2302176d3253a35388e2e62f172f64f4f16605f877" SRC_URI[strsim-0.10.0.sha256sum] = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +SRC_URI[syn-2.0.60.sha256sum] = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" SRC_URI[terminal_size-0.2.6.sha256sum] = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" SRC_URI[terminal_size-0.3.0.sha256sum] = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" SRC_URI[textwrap-0.16.1.sha256sum] = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" -SRC_URI[thiserror-1.0.37.sha256sum] = "10deb33631e3c9018b9baf9dcbbc4f737320d2b576bac10f6aefa048fa407e3e" -SRC_URI[thiserror-impl-1.0.37.sha256sum] = "982d17546b47146b28f7c22e3d08465f6b8903d0ea13c1660d9d84a6e7adcdbb" -SRC_URI[time-0.3.20.sha256sum] = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890" -SRC_URI[time-core-0.1.0.sha256sum] = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd" -SRC_URI[time-macros-0.2.8.sha256sum] = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36" +SRC_URI[thiserror-1.0.61.sha256sum] = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +SRC_URI[thiserror-impl-1.0.61.sha256sum] = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +SRC_URI[time-0.3.36.sha256sum] = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +SRC_URI[time-core-0.1.2.sha256sum] = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" +SRC_URI[time-macros-0.2.18.sha256sum] = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" SRC_URI[tiny-keccak-2.0.2.sha256sum] = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" +SRC_URI[toml_datetime-0.6.6.sha256sum] = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +SRC_URI[toml_edit-0.21.1.sha256sum] = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" SRC_URI[trim-in-place-0.1.7.sha256sum] = "343e926fc669bc8cde4fa3129ab681c63671bae288b1f1081ceee6d9d37904fc" SRC_URI[typenum-1.15.0.sha256sum] = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" SRC_URI[unicode-ident-1.0.5.sha256sum] = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" SRC_URI[unicode-linebreak-0.1.5.sha256sum] = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f" SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" -SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +SRC_URI[unicode-width-0.1.12.sha256sum] = "68f5e5f3158ecfd4b8ff6fe086db7c8467a2dfdac97fe420f2b7c4aa97af66d6" SRC_URI[unicode-xid-0.2.4.sha256sum] = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" -SRC_URI[unindent-0.2.1.sha256sum] = "5aa30f5ea51ff7edfc797c6d3f9ec8cbd8cfedef5371766b7181d33977f4814f" +SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" SRC_URI[utf8parse-0.2.1.sha256sum] = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" SRC_URI[uuid-1.7.0.sha256sum] = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a" -SRC_URI[uutils_term_grid-0.3.0.sha256sum] = "b389452a568698688dda38802068378a16c15c4af9b153cdd99b65391292bbc7" +SRC_URI[uutils_term_grid-0.6.0.sha256sum] = "f89defb4adb4ba5703a57abc879f96ddd6263a444cacc446db90bf2617f141fb" SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" SRC_URI[walkdir-2.5.0.sha256sum] = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" @@ -581,8 +612,11 @@ SRC_URI[windows_x86_64_gnullvm-0.52.0.sha256sum] = "1a657e1e9d3f514745a572a6846d SRC_URI[windows_x86_64_msvc-0.42.2.sha256sum] = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" SRC_URI[windows_x86_64_msvc-0.52.0.sha256sum] = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +SRC_URI[winnow-0.5.40.sha256sum] = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876" SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" SRC_URI[xattr-1.3.1.sha256sum] = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" SRC_URI[yansi-0.5.1.sha256sum] = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" SRC_URI[z85-3.0.5.sha256sum] = "2a599daf1b507819c1121f0bf87fa37eb19daac6aff3aefefd4e6e2e0f2020fc" -SRC_URI[zip-1.1.1.sha256sum] = "f2655979068a1f8fa91cb9e8e5b9d3ee54d18e0ddc358f2f4a395afc0929a84b" +SRC_URI[zerocopy-0.7.33.sha256sum] = "087eca3c1eaf8c47b94d02790dd086cd594b912d2043d4de4bfdd466b3befb7c" +SRC_URI[zerocopy-derive-0.7.33.sha256sum] = "6f4b6c273f496d8fd4eaf18853e6b448760225dc030ff2c485a786859aea6393" +SRC_URI[zip-1.3.0.sha256sum] = "f1f4a27345eb6f7aa7bd015ba7eb4175fa4e1b462a29874b779e0bbcf96c6ac7" diff --git a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.27.bb index 5668aaac5b..320739bee2 100644 --- a/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.26.bb +++ b/meta-openembedded/meta-oe/recipes-core/uutils-coreutils/uutils-coreutils_0.0.27.bb @@ -13,7 +13,7 @@ SRC_URI += "git://github.com/uutils/coreutils.git;protocol=https;branch=main" # so src/uucore/src/lib/features.rs disables utmpx when targetting musl. COMPATIBLE_HOST:libc-musl = "null" -SRCREV = "f95f363096610d7e5e1556d6d0a32b5018065c4c" +SRCREV = "9b11753e7cb06b0f76f4221fc237019c0a86f8f5" S = "${WORKDIR}/git" require ${BPN}-crates.inc @@ -71,3 +71,6 @@ python __anonymous() { for prog in d.getVar('sbindir_progs').split(): d.setVarFlag('ALTERNATIVE_LINK_NAME', prog, '%s/%s' % (d.getVar('sbindir'), prog)) } + +ERROR_QA:remove = "buildpaths" +WARN_QA:append = " buildpaths" diff --git a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_3.4.0.bb b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_3.5.0.bb index 8cd1aa64cc..3a40680a45 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/botan/botan_3.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/botan/botan_3.5.0.bb @@ -1,11 +1,11 @@ SUMMARY = "Crypto and TLS for C++11" HOMEPAGE = "https://botan.randombit.net" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://license.txt;md5=f5254d3abe90ec5bb82c5694ff751546" +LIC_FILES_CHKSUM = "file://license.txt;md5=573e74513ae3057b04757df65b537de0" SECTION = "libs" SRC_URI = "https://botan.randombit.net/releases/Botan-${PV}.tar.xz" -SRC_URI[sha256sum] = "71843afcc0a2c585f8f33fa304f0b58ae4b9c5d8306f894667b3746044277557" +SRC_URI[sha256sum] = "67e8dae1ca2468d90de4e601c87d5f31ff492b38e8ab8bcbd02ddf7104ed8a9f" S = "${WORKDIR}/Botan-${PV}" @@ -18,8 +18,8 @@ CPU:armv7ve = "armv7" do_configure() { python3 ${S}/configure.py \ - --prefix="${D}${exec_prefix}" \ - --libdir="${D}${libdir}" \ + --prefix="${exec_prefix}" \ + --libdir="${libdir}" \ --cpu="${CPU}" \ --cc-bin="${CXX}" \ --cxxflags="${CXXFLAGS}" \ @@ -39,8 +39,8 @@ do_compile() { oe_runmake } do_install() { - oe_runmake install - sed -i -e "s|${D}||g" ${D}${libdir}/pkgconfig/botan-3.pc + oe_runmake DESTDIR=${D} install + sed -i -e 's|${WORKDIR}|<scrubbed>|g' ${D}${includedir}/botan-3/botan/build.h } PACKAGES += "${PN}-python3" diff --git a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb index 504c718b96..60bf501eb9 100644 --- a/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-crypto/cryptsetup/cryptsetup_2.7.5.bb @@ -20,7 +20,7 @@ DEPENDS:append:libc-musl = " argp-standalone" LDFLAGS:append:libc-musl = " -largp" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/${BPN}/v${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}/${BP}.tar.xz" -SRC_URI[sha256sum] = "219ebf74e8eddf96624a0376477e5a6f8f350a67aaf36e7dadb114d94b3afef4" +SRC_URI[sha256sum] = "d2be4395b8f503b0ebf4b2d81db90c35a97050a358ee21fe62a0dfb66e5d5522" inherit autotools gettext pkgconfig @@ -53,7 +53,7 @@ PACKAGECONFIG[veritysetup] = "--enable-veritysetup,--disable-veritysetup" PACKAGECONFIG[luks2-reencryption] = "--enable-luks2-reencryption,--disable-luks2-reencryption" PACKAGECONFIG[integritysetup] = "--enable-integritysetup,--disable-integritysetup" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2-udevrules" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,,udev lvm2" PACKAGECONFIG[kernel_crypto] = "--enable-kernel_crypto,--disable-kernel_crypto" # gcrypt-pkbdf2 requries --with-crypto_backend=gcrypt or the flag isn't # recognized. diff --git a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb index 9506d0e55d..cc8161cc3d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/influxdb/influxdb_1.8.10.bb @@ -38,7 +38,7 @@ USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system -d /var/lib/influxdb -m -s /bin/nologin influxdb" do_install:prepend() { - test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py + test -e ${B}/src/${GO_IMPORT}/build.py && rm ${B}/src/${GO_IMPORT}/build.py test -e ${B}/src/${GO_IMPORT}/build.sh && rm ${B}/src/${GO_IMPORT}/build.sh rm -rf ${B}/src/${GO_IMPORT}/Dockerfile* @@ -75,3 +75,5 @@ INITSCRIPT_NAME = "influxdb" INITSCRIPT_PARAMS = "defaults" SYSTEMD_SERVICE:${PN} = "influxdb.service" + +CVE_STATUS[CVE-2019-10329] = "cpe-incorrect: Version does not match and only the Jenkins plugin is affected." diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb index 578357b480..578357b480 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.7.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb-native_10.11.9.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc index 4bfa1c9caa..ae6581ec71 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb.inc @@ -23,20 +23,20 @@ SRC_URI = "https://archive.mariadb.org/${BP}/source/${BP}.tar.gz \ file://0001-sql-CMakeLists.txt-fix-gen_lex_hash-not-found.patch \ file://lfs64.patch \ file://0001-Add-missing-includes-cstdint-and-cstdio.patch \ - file://0001-Remove-the-compile_time_assert-lines.patch \ - file://0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch \ " SRC_URI:append:libc-musl = " file://ppc-remove-glibc-dep.patch" -SRC_URI[sha256sum] = "5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157" +SRC_URI[sha256sum] = "0a00180864cd016187c986faab8010de23a117b9a75f91d6456421f894e48d20" -UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/releases" +UPSTREAM_CHECK_URI = "https://github.com/MariaDB/server/tags" BINCONFIG_GLOB = "mysql_config" -inherit cmake gettext binconfig update-rc.d systemd multilib_script pkgconfig +inherit cmake gettext binconfig update-rc.d systemd multilib_script multilib_header pkgconfig MULTILIB_SCRIPTS = "${PN}-server:${bindir}/mariadbd-safe \ - ${PN}-setupdb:${bindir}/mariadb-install-db" + ${PN}-setupdb:${bindir}/mariadb-install-db \ + libmysqlclient-dev:${bindir}/mysql_config \ + " INITSCRIPT_PACKAGES = "${PN}-server ${PN}-setupdb" INITSCRIPT_NAME:${PN}-server = "mysqld" @@ -160,6 +160,7 @@ mariadb_sysroot_preprocess () { do_install() { oe_runmake 'DESTDIR=${D}' install + oe_multilib_header mysql/mariadb_version.h mysql/server/my_config.h mysql/server/private/config.h install -d ${D}/${sysconfdir}/init.d install -m 0644 ${UNPACKDIR}/my.cnf ${D}/${sysconfdir}/ diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index 3e42535dad..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-MDEV-33439-Fix-build-with-libxml2-2.12.patch +++ /dev/null @@ -1,170 +0,0 @@ -From dae52f5916ef59434c93f0b716270f59dd0c3a94 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar <jtojnar@gmail.com> -Date: Sun, 7 Jan 2024 10:19:54 +0100 -Subject: [PATCH] MDEV-33439 Fix build with libxml2 2.12 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -libxml2 2.12.0 made `xmlGetLastError()` return `const` pointer: - -https://gitlab.gnome.org/GNOME/libxml2/-/commit/61034116d0a3c8b295c6137956adc3ae55720711 - -Clang 16 does not like this: - - error: assigning to 'xmlErrorPtr' (aka '_xmlError *') from 'const xmlError *' (aka 'const _xmlError *') discards qualifiers - error: cannot initialize a variable of type 'xmlErrorPtr' (aka '_xmlError *') with an rvalue of type 'const xmlError *' (aka 'const _xmlError *') - -Let’s update the variables to `const`. -For older versions, it will be automatically converted. - -But then `xmlResetError(xmlError*)` will not like the `const` pointer: - - error: no matching function for call to 'xmlResetError' - note: candidate function not viable: 1st argument ('const xmlError *' (aka 'const _xmlError *')) would lose const qualifier - -Let’s replace it with `xmlResetLastError()`. - -ALso remove `LIBXMLDOC::Xerr` protected member property. -It was introduced in 65b0e5455b547a3d574fa77b34cce23ae3bea0a0 -along with the `xmlResetError` calls. -It does not appear to be used for anything. - -Upstream-Status: Backport [https://github.com/MariaDB/server/pull/2983] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - storage/connect/libdoc.cpp | 39 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 20 deletions(-) - -diff --git a/storage/connect/libdoc.cpp b/storage/connect/libdoc.cpp -index 67f22ce2..ab588dd4 100644 ---- a/storage/connect/libdoc.cpp -+++ b/storage/connect/libdoc.cpp -@@ -93,7 +93,6 @@ class LIBXMLDOC : public XMLDOCUMENT { - xmlXPathContextPtr Ctxp; - xmlXPathObjectPtr Xop; - xmlXPathObjectPtr NlXop; -- xmlErrorPtr Xerr; - char *Buf; // Temporary - bool Nofreelist; - }; // end of class LIBXMLDOC -@@ -327,7 +326,6 @@ LIBXMLDOC::LIBXMLDOC(char *nsl, char *nsdf, char *enc, PFBLOCK fp) - Ctxp = NULL; - Xop = NULL; - NlXop = NULL; -- Xerr = NULL; - Buf = NULL; - Nofreelist = false; - } // end of LIBXMLDOC constructor -@@ -365,8 +363,8 @@ bool LIBXMLDOC::ParseFile(PGLOBAL g, char *fn) - Encoding = (char*)Docp->encoding; - - return false; -- } else if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ } else if (xmlGetLastError()) -+ xmlResetLastError(); - - return true; - } // end of ParseFile -@@ -505,9 +503,9 @@ int LIBXMLDOC::DumpDoc(PGLOBAL g, char *ofn) - #if 1 - // This function does not crash ( - if (xmlSaveFormatFileEnc((const char *)ofn, Docp, Encoding, 0) < 0) { -- xmlErrorPtr err = xmlGetLastError(); -+ const xmlError *err = xmlGetLastError(); - strcpy(g->Message, (err) ? err->message : "Error saving XML doc"); -- xmlResetError(Xerr); -+ xmlResetLastError(); - rc = -1; - } // endif Save - // rc = xmlDocDump(of, Docp); -@@ -546,8 +544,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Nlist) { - xmlXPathFreeNodeSet(Nlist); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Nlist = NULL; - } // endif Nlist -@@ -555,8 +553,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Xop) { - xmlXPathFreeObject(Xop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Xop = NULL; - } // endif Xop -@@ -564,8 +562,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (NlXop) { - xmlXPathFreeObject(NlXop); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - NlXop = NULL; - } // endif NlXop -@@ -573,8 +571,8 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - if (Ctxp) { - xmlXPathFreeContext(Ctxp); - -- if ((Xerr = xmlGetLastError())) -- xmlResetError(Xerr); -+ if (xmlGetLastError()) -+ xmlResetLastError(); - - Ctxp = NULL; - } // endif Ctxp -@@ -590,6 +588,7 @@ void LIBXMLDOC::CloseDoc(PGLOBAL g, PFBLOCK xp) - /******************************************************************/ - xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - { -+ const xmlError *xerr; - xmlNodeSetPtr nl; - - if (trace(1)) -@@ -649,11 +648,11 @@ xmlNodeSetPtr LIBXMLDOC::GetNodeList(PGLOBAL g, xmlNodePtr np, char *xp) - } else - xmlXPathFreeObject(Xop); // Caused node not found - -- if ((Xerr = xmlGetLastError())) { -- strcpy(g->Message, Xerr->message); -- xmlResetError(Xerr); -+ if ((xerr = xmlGetLastError())) { -+ strcpy(g->Message, xerr->message); -+ xmlResetLastError(); - return NULL; -- } // endif Xerr -+ } // endif xerr - - } // endif Xop - -@@ -1079,7 +1078,7 @@ void XML2NODE::AddText(PGLOBAL g, PCSZ txtp) - /******************************************************************/ - void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - { -- xmlErrorPtr xerr; -+ const xmlError *xerr; - - if (trace(1)) - htrc("DeleteChild: node=%p\n", dnp); -@@ -1122,7 +1121,7 @@ void XML2NODE::DeleteChild(PGLOBAL g, PXNODE dnp) - if (trace(1)) - htrc("DeleteChild: errmsg=%-.256s\n", xerr->message); - -- xmlResetError(xerr); -+ xmlResetLastError(); - } // end of DeleteChild - - /* -------------------- class XML2NODELIST ---------------------- */ --- -2.44.0 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch deleted file mode 100644 index 9a6e28297b..0000000000 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb/0001-Remove-the-compile_time_assert-lines.patch +++ /dev/null @@ -1,43 +0,0 @@ -From cc5f1d0759b367265a1a000287e2ec15c31eb518 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Mon, 26 Feb 2024 14:56:02 +0800 -Subject: [PATCH] Remove the compile_time_assert lines - -Remove the problematic compile_time_assert lines to fix the below build -failure on 32-bit arm. - In file included from TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_test.c:38: - TOPDIR/build/tmp/work/cortexa15t2hf-neon-yoe-linux-gnueabi/mariadb/10.11.7/mariadb-10.11.7/tests/mysql_client_fw.c:1438:3: error: 'compile_time_assert' declared as an array with a negative size - 1438 | compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); - | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Upstream-Status: Inappropriate [Upstream will bring the asset back - in a new way [1]] -[1] https://jira.mariadb.org/browse/MDEV-33429 - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - tests/mysql_client_fw.c | 8 -------- - 1 file changed, 8 deletions(-) - -diff --git a/tests/mysql_client_fw.c b/tests/mysql_client_fw.c -index c9e64678..5c0c7ce2 100644 ---- a/tests/mysql_client_fw.c -+++ b/tests/mysql_client_fw.c -@@ -1430,14 +1430,6 @@ int main(int argc, char **argv) - tests_to_run[i]= NULL; - } - --#ifdef _WIN32 -- /* must be the same in C/C and embedded, 1208 on 64bit, 968 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 60*sizeof(void*)+728); --#else -- /* must be the same in C/C and embedded, 1272 on 64bit, 964 on 32bit */ -- compile_time_assert(sizeof(MYSQL) == 77*sizeof(void*)+656); --#endif -- - if (mysql_server_init(embedded_server_arg_count, - embedded_server_args, - (char**) embedded_server_groups)) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb index b1d1355e2b..b1d1355e2b 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.7.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/mysql/mariadb_10.11.9.bb diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch index 9df4d073ff..342aeba85e 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/files/0003-configure.ac-bypass-autoconf-2.69-version-check.patch @@ -13,12 +13,12 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac -index 401ce30..27f382d 100644 +index 65715a4..4ad6340 100644 --- a/configure.ac +++ b/configure.ac @@ -19,10 +19,6 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros - AC_INIT([PostgreSQL], [16.3], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) + AC_INIT([PostgreSQL], [16.4], [pgsql-bugs@lists.postgresql.org], [], [https://www.postgresql.org/]) -m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.69 is required. -Untested combinations of 'autoconf' and PostgreSQL versions are not @@ -28,5 +28,5 @@ index 401ce30..27f382d 100644 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c]) AC_CONFIG_AUX_DIR(config) -- -2.25.1 +2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc index 2dd7dd6fda..4fc2e47b35 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql.inc @@ -19,7 +19,7 @@ DESCRIPTION = "\ " HOMEPAGE = "http://www.postgresql.com" LICENSE = "0BSD" -DEPENDS = "libnsl2 readline tzcode-native" +DEPENDS = "libnsl2 tzcode-native perl" ARM_INSTRUCTION_SET = "arm" @@ -37,7 +37,7 @@ LEAD_SONAME = "libpq.so" export LDFLAGS_SL = "${LDFLAGS}" export LDFLAGS_EX_BE = "-Wl,--export-dynamic" -inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext cpan-base multilib_header +inherit autotools pkgconfig perlnative python3native python3targetconfig useradd update-rc.d systemd gettext perl-version multilib_header CFLAGS += "-I${STAGING_INCDIR}/${PYTHON_DIR} -I${STAGING_INCDIR}/tcl8.6" @@ -55,7 +55,7 @@ pkg_postinst:${PN} () { PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd', d)} \ - openssl python uuid libxml tcl perl zlib icu \ + openssl python uuid libxml tcl perl zlib icu readline \ " PACKAGECONFIG[tcl] = "--with-tcl --with-tclconfig=${STAGING_BINDIR_CROSS},--without-tcl,tcl tcl-native," PACKAGECONFIG[perl] = "--with-perl,--without-perl,perl,perl" @@ -71,6 +71,7 @@ PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" PACKAGECONFIG[lz4] = "--with-lz4,--without-lz4,lz4" PACKAGECONFIG[openssl] = "--with-ssl=openssl,ac_cv_file__dev_urandom=yes,openssl" PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu,icu" +PACKAGECONFIG[readline] = "--with-readline,--without-readline,readline" EXTRA_OECONF += "--enable-thread-safety --disable-rpath \ --datadir=${datadir}/${BPN} \ @@ -122,6 +123,12 @@ python populate_packages:prepend() { } +# Same as the function in cpan-base.bbclass (but without the perl RDEPENDS) +def is_target(d): + if not bb.data.inherits_class('native', d): + return "yes" + return "no" + # This will make native perl use target settings (for include dirs etc.) export PERLCONFIGTARGET = "${@is_target(d)}" export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl5/${@get_perl_version(d)}/${@get_perl_arch(d)}" diff --git a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb index 6df719cd98..1a47369e4d 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_16.3.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/postgresql/postgresql_16.4.bb @@ -11,6 +11,6 @@ SRC_URI += "\ file://0005-postgresql-fix-ptest-failure-of-sysviews.patch \ " -SRC_URI[sha256sum] = "331963d5d3dc4caf4216a049fa40b66d6bcb8c730615859411b9518764e60585" +SRC_URI[sha256sum] = "971766d645aa73e93b9ef4e3be44201b4f45b5477095b049125403f9f3386d6f" CVE_STATUS[CVE-2017-8806] = "not-applicable-config: Ddoesn't apply to out configuration of postgresql so we can safely ignore it." diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch new file mode 100644 index 0000000000..9a85e8db45 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/files/static_library_as_option.patch @@ -0,0 +1,71 @@ +From 285d306494bde3e9c24c8cd6fea1eb380a304d03 Mon Sep 17 00:00:00 2001 +From: Bindu-Bhabu <bindudaniel1996@gmail.com> +Date: Fri, 26 Jul 2024 15:14:45 +0530 +Subject: Add option to CMake for building static libraries + +ROCKSDB creates a STATIC library target reference by default. +Modify the cmake so that the STATIC library is also an option +just like creating a SHARED library and set default to ON. + +Upstream-Status: Submitted [https://github.com/facebook/rocksdb/pull/12890] + +Signed-off-by: Nisha Parrakat <nisha.m.parrakat@bmw.de> +Signed-off-by: Bindu Bhabu <bhabu.bindu@kpit.com> +--- + CMakeLists.txt | 29 +++++++++++++++++------------ + 1 file changed, 17 insertions(+), 12 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 93b884dd9c1..2ca925d505c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -98,6 +98,7 @@ if (WITH_WINDOWS_UTF8_FILENAMES) + add_definitions(-DROCKSDB_WINDOWS_UTF8_FILENAMES) + endif() + option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON) ++option(ROCKSDB_BUILD_STATIC "Build static versions of the RocksDB libraries" ON) + + if( NOT DEFINED CMAKE_CXX_STANDARD ) + set(CMAKE_CXX_STANDARD 17) +@@ -1139,11 +1140,13 @@ string(REGEX REPLACE "[^0-9: /-]+" "" GIT_DATE "${GIT_DATE}") + set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc) + configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY) + +-add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) +-target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC +- $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>) +-target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE +- ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) ++if(ROCKSDB_BUILD_STATIC) ++ add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC}) ++ target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC ++ $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>) ++ target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE ++ ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) ++endif() + + if(ROCKSDB_BUILD_SHARED) + add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC}) +@@ -1238,13 +1241,15 @@ if(NOT WIN32 OR ROCKSDB_INSTALL_ON_WINDOWS) + + install(DIRECTORY "${PROJECT_SOURCE_DIR}/cmake/modules" COMPONENT devel DESTINATION ${package_config_destination}) + +- install( +- TARGETS ${ROCKSDB_STATIC_LIB} +- EXPORT RocksDBTargets +- COMPONENT devel +- ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" +- INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" +- ) ++ if(ROCKSDB_BUILD_STATIC) ++ install( ++ TARGETS ${ROCKSDB_STATIC_LIB} ++ EXPORT RocksDBTargets ++ COMPONENT devel ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ++ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}" ++ ) ++ endif() + + if(ROCKSDB_BUILD_SHARED) + install( diff --git a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb index 444351dbb4..fae54fdba4 100644 --- a/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-dbs/rocksdb/rocksdb_9.0.0.bb @@ -17,6 +17,7 @@ SRC_URI = "git://github.com/facebook/${BPN}.git;branch=${SRCBRANCH};protocol=htt file://0005-Implement-timer-implementation-for-mips-platform.patch \ file://0006-Implement-timer-for-arm-v6.patch \ file://0007-Fix-declaration-scope-of-LE_LOAD32-in-crc32c.patch \ + file://static_library_as_option.patch \ " SRC_URI:append:riscv32 = " file://0001-replace-old-sync-with-new-atomic-builtin-equivalents.patch" @@ -43,6 +44,7 @@ EXTRA_OECMAKE = "\ -DWITH_BENCHMARK_TOOLS=OFF \ -DWITH_TOOLS=OFF \ -DFAIL_ON_WARNINGS=OFF \ + -DROCKSDB_BUILD_STATIC=OFF \ " CXXFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch index 5242b29e06..6fecf25603 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-always-use-asm-sgidefs.h.patch @@ -1,7 +1,7 @@ -From 738549dea7a4e6c462a79962c414eaa450c2cffd Mon Sep 17 00:00:00 2001 +From 11faa06436fdeb0c9948080a11f9a99d3b5ba16c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 9 Apr 2020 13:06:27 -0700 -Subject: [PATCH 1/3] absl: always use <asm/sgidefs.h> +Subject: [PATCH] absl: always use <asm/sgidefs.h> Fixes mips/musl build, since sgidefs.h is not present on all C libraries but on linux asm/sgidefs.h is there and contains same definitions, using @@ -10,13 +10,12 @@ that makes it portable. Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> - --- absl/base/internal/direct_mmap.h | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/absl/base/internal/direct_mmap.h b/absl/base/internal/direct_mmap.h -index e492bb0..c8a4fba 100644 +index 1beb2ee4..140b0697 100644 --- a/absl/base/internal/direct_mmap.h +++ b/absl/base/internal/direct_mmap.h @@ -41,13 +41,9 @@ diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch index b92a487523..d49e860f21 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch @@ -1,20 +1,19 @@ -From d25cf3b9aa873595a19e197cc29ab46c0093bff1 Mon Sep 17 00:00:00 2001 +From a573ccd57e713486e7d8e782d6b3b34fde01ff9e Mon Sep 17 00:00:00 2001 From: Sinan Kaya <sinan.kaya@microsoft.com> Date: Mon, 3 Feb 2020 03:25:57 +0000 -Subject: [PATCH 2/3] Remove maes option from cross-compilation +Subject: [PATCH] Remove maes option from cross-compilation ---- Upstream-Status: Pending - +--- absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- absl/copts/GENERATED_copts.bzl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index a4ab1aa2041e..23b9253c1f00 100644 +index da2282fe..5e0e8dfd 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -158,7 +158,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS +@@ -229,7 +229,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS ) @@ -23,10 +22,10 @@ index a4ab1aa2041e..23b9253c1f00 100644 - "-msse4.1" -) diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index a6efc98e11d4..1e847f769501 100644 +index b9e0071e..0072008c 100644 --- a/absl/copts/GENERATED_copts.bzl +++ b/absl/copts/GENERATED_copts.bzl -@@ -159,7 +159,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ +@@ -230,7 +230,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ ] @@ -35,5 +34,5 @@ index a6efc98e11d4..1e847f769501 100644 - "-msse4.1", -] -- -2.36.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch index 1a80a428b7..c82b9e1b51 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch @@ -1,24 +1,24 @@ -From fb24c3e3539b5743d398a429a302a3886186f261 Mon Sep 17 00:00:00 2001 +From 632632508daf8bb3a5800dac937ffc33c6d85973 Mon Sep 17 00:00:00 2001 From: Jonas Gorski <jonas.gorski@bisdn.de> Date: Thu, 16 Jun 2022 11:46:31 +0000 -Subject: [PATCH 3/3] Remove neon option from cross compilation +Subject: [PATCH] Remove neon option from cross compilation Not every arm platform supports neon instructions, so do not enforce them. -Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de> ---- Upstream-Status: Pending +Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de> +--- absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- absl/copts/GENERATED_copts.bzl | 4 ---- 2 files changed, 8 deletions(-) diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index 23b9253c1f00..5d112a97f3e4 100644 +index 5e0e8dfd..57cfc4d3 100644 --- a/absl/copts/GENERATED_AbseilCopts.cmake +++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -147,10 +147,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS +@@ -218,10 +218,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS "/DNOMINMAX" ) @@ -30,10 +30,10 @@ index 23b9253c1f00..5d112a97f3e4 100644 "-march=armv8-a+crypto" ) diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index 1e847f769501..3e10db204faf 100644 +index 0072008c..72840fda 100644 --- a/absl/copts/GENERATED_copts.bzl +++ b/absl/copts/GENERATED_copts.bzl -@@ -148,10 +148,6 @@ ABSL_MSVC_TEST_FLAGS = [ +@@ -219,10 +219,6 @@ ABSL_MSVC_TEST_FLAGS = [ "/DNOMINMAX", ] @@ -45,5 +45,5 @@ index 1e847f769501..3e10db204faf 100644 "-march=armv8-a+crypto", ] -- -2.36.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch deleted file mode 100644 index 461df7a608..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7335a36d0b5c1c597566f9aa3f458a5b6817c3b4 Mon Sep 17 00:00:00 2001 -From: aurel32 <aurelien@aurel32.net> -Date: Fri, 22 Mar 2024 14:21:13 -0700 -Subject: [PATCH] PR #1644: unscaledcycleclock: remove RISC-V support - -Imported from GitHub PR https://github.com/abseil/abseil-cpp/pull/1644 - -Starting with Linux 6.6 [1], RDCYCLE is a privileged instruction on RISC-V and can't be used directly from userland. There is a sysctl option to change that as a transition period, but it will eventually disappear. - -The RDTIME instruction is another less accurate alternative, however its frequency varies from board to board, and there is currently now way to get its frequency from userland [2]. - -Therefore this patch just removes the code for unscaledcycleclock on RISC-V. Without processor specific implementation, abseil relies on std::chrono::steady_clock::now().time_since_epoch() which is basically a wrapper around clock_gettime (CLOCK_MONOTONIC), which in turns use __vdso_clock_gettime(). On RISC-V this VDSO is just a wrapper around RDTIME correctly scaled to use nanoseconds units. - -This fixes the testsuite on riscv64, tested on a VisionFive 2 board. - -[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=cc4c07c89aada16229084eeb93895c95b7eabaa3 -[2] https://github.com/abseil/abseil-cpp/pull/1631 -Merge 43356a2548cfde76e164d446cb69004b488c6a71 into 76f8011beabdaee872b5fde7546e02407b220cb1 - -Merging this change closes #1644 - -COPYBARA_INTEGRATE_REVIEW=https://github.com/abseil/abseil-cpp/pull/1644 from aurel32:rv64-no-unscaledcycleclock 43356a2548cfde76e164d446cb69004b488c6a71 -PiperOrigin-RevId: 618286262 -Change-Id: Ie4120a727e7d0bb185df6e06ea145c780ebe6652 - -Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/7335a36d] -[Adapted to apply on top of meta-oe's patch stack] -Signed-off-by: Scott Murray <scott.murray@konsulko.com> ---- - absl/base/internal/unscaledcycleclock.cc | 12 ------------ - absl/base/internal/unscaledcycleclock_config.h | 5 ++--- - 2 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc -index f11fecb3..103b4f6a 100644 ---- a/absl/base/internal/unscaledcycleclock.cc -+++ b/absl/base/internal/unscaledcycleclock.cc -@@ -121,18 +121,6 @@ double UnscaledCycleClock::Frequency() { - return aarch64_timer_frequency; - } - --#elif defined(__riscv) -- --int64_t UnscaledCycleClock::Now() { -- int64_t virtual_timer_value; -- asm volatile("rdcycle %0" : "=r"(virtual_timer_value)); -- return virtual_timer_value; --} -- --double UnscaledCycleClock::Frequency() { -- return base_internal::NominalCPUFrequency(); --} -- - #elif defined(_M_IX86) || defined(_M_X64) - - #pragma intrinsic(__rdtsc) -diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h -index 5e232c1a..83552fc5 100644 ---- a/absl/base/internal/unscaledcycleclock_config.h -+++ b/absl/base/internal/unscaledcycleclock_config.h -@@ -22,7 +22,6 @@ - // The following platforms have an implementation of a hardware counter. - #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ - ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -- defined(__riscv) || \ - defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) - #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 - #else -@@ -54,8 +53,8 @@ - #if ABSL_USE_UNSCALED_CYCLECLOCK - // This macro can be used to test if UnscaledCycleClock::Frequency() - // is NominalCPUFrequency() on a particular platform. --#if (defined(__i386__) || defined(__x86_64__) || defined(__riscv) || \ -- defined(_M_IX86) || defined(_M_X64)) -+#if (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || \ -+ defined(_M_X64)) - #define ABSL_INTERNAL_UNSCALED_CYCLECLOCK_FREQUENCY_IS_CPU_FREQUENCY - #endif - #endif --- -2.44.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch index f2ebd9f08c..ba0cd66920 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/abseil-ppc-fixes.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch @@ -1,4 +1,7 @@ -Upstream-Status: Pending +From f9607924225ca59fb6c60222e6424b84e6f70029 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 21 Sep 2024 20:53:06 +0800 +Subject: [PATCH] abseil: ppc fixes An all-in-one patch that fixes several issues: @@ -9,14 +12,24 @@ An all-in-one patch that fixes several issues: Sourced from void linux +Upstream-Status: Pending + Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + absl/base/internal/unscaledcycleclock.cc | 4 ++-- + absl/base/internal/unscaledcycleclock_config.h | 3 ++- + absl/debugging/internal/examine_stack.cc | 8 +++++++- + absl/debugging/internal/stacktrace_config.h | 2 +- + 4 files changed, 12 insertions(+), 5 deletions(-) +diff --git a/absl/base/internal/unscaledcycleclock.cc b/absl/base/internal/unscaledcycleclock.cc +index a0bf3a65..103b4f6a 100644 --- a/absl/base/internal/unscaledcycleclock.cc +++ b/absl/base/internal/unscaledcycleclock.cc @@ -20,7 +20,7 @@ #include <intrin.h> #endif - + -#if defined(__powerpc__) || defined(__ppc__) +#if (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) #ifdef __GLIBC__ @@ -25,30 +38,34 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> @@ -58,7 +58,7 @@ double UnscaledCycleClock::Frequency() { return base_internal::NominalCPUFrequency(); } - + -#elif defined(__powerpc__) || defined(__ppc__) +#elif (defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__) - + int64_t UnscaledCycleClock::Now() { #ifdef __GLIBC__ +diff --git a/absl/base/internal/unscaledcycleclock_config.h b/absl/base/internal/unscaledcycleclock_config.h +index 43a3dabe..196a8535 100644 --- a/absl/base/internal/unscaledcycleclock_config.h +++ b/absl/base/internal/unscaledcycleclock_config.h @@ -21,7 +21,8 @@ - + // The following platforms have an implementation of a hardware counter. #if defined(__i386__) || defined(__x86_64__) || defined(__aarch64__) || \ -- defined(__powerpc__) || defined(__ppc__) || defined(__riscv) || \ +- defined(__powerpc__) || defined(__ppc__) || defined(_M_IX86) || \ + ((defined(__powerpc__) || defined(__ppc__)) && defined(__GLIBC__)) || \ -+ defined(__riscv) || \ - defined(_M_IX86) || (defined(_M_X64) && !defined(_M_ARM64EC)) ++ defined(_M_IX86) || \ + (defined(_M_X64) && !defined(_M_ARM64EC)) #define ABSL_HAVE_UNSCALED_CYCLECLOCK_IMPLEMENTATION 1 #else +diff --git a/absl/debugging/internal/examine_stack.cc b/absl/debugging/internal/examine_stack.cc +index 3dd6ba1a..f923b055 100644 --- a/absl/debugging/internal/examine_stack.cc +++ b/absl/debugging/internal/examine_stack.cc -@@ -33,6 +33,10 @@ +@@ -36,6 +36,10 @@ #include <csignal> #include <cstdio> - + +#if defined(__powerpc__) +#include <asm/ptrace.h> +#endif @@ -56,7 +73,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #include "absl/base/attributes.h" #include "absl/base/internal/raw_logging.h" #include "absl/base/macros.h" -@@ -174,8 +178,10 @@ void* GetProgramCounter(void* const vuc) { +@@ -177,8 +181,10 @@ void* GetProgramCounter(void* const vuc) { return reinterpret_cast<void*>(context->uc_mcontext.pc); #elif defined(__powerpc64__) return reinterpret_cast<void*>(context->uc_mcontext.gp_regs[32]); @@ -68,6 +85,8 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #elif defined(__riscv) return reinterpret_cast<void*>(context->uc_mcontext.__gregs[REG_PC]); #elif defined(__s390__) && !defined(__s390x__) +diff --git a/absl/debugging/internal/stacktrace_config.h b/absl/debugging/internal/stacktrace_config.h +index 3929b1b7..23d5e504 100644 --- a/absl/debugging/internal/stacktrace_config.h +++ b/absl/debugging/internal/stacktrace_config.h @@ -60,7 +60,7 @@ @@ -79,3 +98,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> #define ABSL_STACKTRACE_INL_HEADER \ "absl/debugging/internal/stacktrace_powerpc-inl.inc" #elif defined(__aarch64__) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb index 87ab239311..f44a5d9082 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240116.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb @@ -7,14 +7,13 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -SRCREV = "d7aaad83b488fd62bd51c81ecf16cd938532cc0a" -BRANCH = "lts_2024_01_16" +SRCREV = "4447c7562e3bc702ade25105912dce503f0c4010" +BRANCH = "lts_2024_07_22" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ file://0002-Remove-maes-option-from-cross-compilation.patch \ - file://abseil-ppc-fixes.patch \ file://0003-Remove-neon-option-from-cross-compilation.patch \ - file://0004-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ + file://0004-abseil-ppc-fixes.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb index f73be8dbbf..abf21803e5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools-conf_1.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda SRC_URI = "file://android-gadget-setup" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service index ddf8d7f74e..b6661f2e39 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools/android-tools-adbd.service @@ -1,6 +1,6 @@ [Unit] Description=Android Debug Bridge -ConditionPathExists=/var/usb-debugging-enabled +ConditionPathExists=/etc/usb-debugging-enabled Before=android-system.service [Service] diff --git a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb index 6343256d39..a291fc39a2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/android-tools/android-tools_5.1.1.r37.bb @@ -189,7 +189,12 @@ FILES:${PN}-fstools = "\ BBCLASSEXTEND = "native" android_tools_enable_devmode() { - touch ${IMAGE_ROOTFS}/var/usb-debugging-enabled + touch ${IMAGE_ROOTFS}/etc/usb-debugging-enabled } ROOTFS_POSTPROCESS_COMMAND_${PN}-adbd += "${@bb.utils.contains("USB_DEBUGGING_ENABLED", "1", "android_tools_enable_devmode;", "", d)}" + +# http://errors.yoctoproject.org/Errors/Details/766881/ +# android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:23: error: passing argument 2 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +# android-tools/5.1.1.r37/git/system/core/adb/adb_auth_host.c:86:27: error: passing argument 3 of 'RSA_get0_key' from incompatible pointer type [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb index cb4aef5224..daeeb975f2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/capnproto/capnproto_1.0.2.bb @@ -12,6 +12,8 @@ S = "${WORKDIR}/git/c++" inherit cmake +CVE_PRODUCT = "capnproto capnp" + CXXFLAGS:append:mips = " -latomic" CXXFLAGS:append:powerpc = " -latomic" CXXFLAGS:append:riscv32 = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb index 5e992845a1..bdeab3055c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cjson/cjson_1.7.18.bb @@ -24,6 +24,11 @@ do_install_ptest() { sed s#${B}#${PTEST_PATH}# ${B}/CTestTestfile.cmake > ${D}${PTEST_PATH}/CTestTestfile.cmake sed s#${B}#${PTEST_PATH}# ${B}/tests/CTestTestfile.cmake > ${D}${PTEST_PATH}/tests/CTestTestfile.cmake sed s#${B}#${PTEST_PATH}# ${B}/fuzzing/CTestTestfile.cmake > ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake + # The cmake files also contain full paths to original CMakeLists.txt file in _BACKTRACE_TRIPLES property; + # these are not needed for successful ptests as we don't install the CMakeLists.txt files anyway. + sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/CTestTestfile.cmake + sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/tests/CTestTestfile.cmake + sed -i s#${S}#${PTEST_PATH}#g ${D}${PTEST_PATH}/fuzzing/CTestTestfile.cmake # install test artifacts install ${B}/cJSON_test ${D}${PTEST_PATH} install ${B}/tests/cjson_add ${B}/tests/*_tests ${B}/tests/parse_* ${B}/tests/print_* ${B}/tests/readme_examples ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.98.bb b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.98.bb index ea5f00669f..acf882cc76 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.98.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/cloc/cloc_1.98.bb @@ -8,6 +8,7 @@ SRC_URI = "https://github.com/AlDanial/cloc/releases/download/v${PV}/${BP}.tar.g SRC_URI[sha256sum] = "5fe0b159eb75718df7308a4f61470eaddf82170733929999e37a3fbb4651cf8a" UPSTREAM_CHECK_URI = "https://github.com/AlDanial/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb b/meta-openembedded/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb new file mode 100644 index 0000000000..0d7bdc83dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cppgenerate/cppgenerate_0.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "C++ Code Generator library" +BUGTRACKER = "https://github.com/rm5248/libcppgenerate/issues" +SECTION = "libs" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fa818a259cbed7ce8bc2a22d35a464fc" + +SRC_URI = "git://github.com/rm5248/libcppgenerate.git;branch=master;protocol=https" +SRCREV = "930c5503f76c877b72b9ff8546353d6f422bd010" + +S = "${WORKDIR}/git" + +inherit cmake + +BBCLASSEXTEND="native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb b/meta-openembedded/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb new file mode 100644 index 0000000000..b404d4131e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/cpuset/cpuset_1.6.2.bb @@ -0,0 +1,13 @@ +SUMMARY = "Cpuset manipulation tool" +HOMEPAGE = "https://github.com/SUSE/cpuset" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" + +SRC_URI = "git://github.com/SUSE/cpuset.git;protocol=https;branch=master" + +SRCREV = "4f80263208935f0df4f616cf9d8cb7285599a670" +S = "${WORKDIR}/git" + +inherit setuptools3 + +RDEPENDS:${PN} += "python3-core python3-logging python3-pydoc" diff --git a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240915.0.bb index f8add448b8..247e1a8446 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240602.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ctags/ctags_6.1.20240915.0.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" inherit autotools-brokensep pkgconfig manpages -SRCREV = "653ca9204527fe1da7ecf97c3da4308f9ab17d2c" +SRCREV = "40b58618f9f0dc4123a205cbd50b73c6ab2e6f5c" SRC_URI = "git://github.com/universal-ctags/ctags;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch index 12dd238108..faa66e0268 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-support-to-override-usr-sbin-and-usr-share.patch @@ -1,20 +1,20 @@ -From 87d0174e8d56e7458dc94f05f82ab7a67a5cf7d0 Mon Sep 17 00:00:00 2001 +From 6c8b0a3f9c09a7a135d95ff18038bcba22e87b86 Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 8 Apr 2021 14:06:05 +0800 -Subject: [PATCH 1/2] support to override /usr/sbin and /usr/share +Subject: [PATCH] support to override /usr/sbin and /usr/share Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) + Makefile | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile -index 8516803..a2d8c00 100644 +index 21a9a39..649f465 100644 --- a/Makefile +++ b/Makefile -@@ -5,14 +5,16 @@ all: +@@ -5,13 +5,15 @@ all: clean: @@ -28,14 +28,12 @@ index 8516803..a2d8c00 100644 + mkdir -p $(DESTDIR)$(sbindir) cp -a scripts/* $(DSDIR)/scripts/ - install -o root -g root -m 0644 functions $(DSDIR)/ + install -m 0644 functions $(DSDIR)/ - sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)/usr/sbin/debootstrap -- chown root:root $(DESTDIR)/usr/sbin/debootstrap - chmod 0755 $(DESTDIR)/usr/sbin/debootstrap + sed 's/@VERSION@/$(VERSION)/g' debootstrap >$(DESTDIR)$(sbindir)/debootstrap -+ chown root:root $(DESTDIR)$(sbindir)/debootstrap + chmod 0755 $(DESTDIR)$(sbindir)/debootstrap -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch index 69329df4ea..5de65779d4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0002-support-to-override-usr-bin-arch-test.patch @@ -1,7 +1,7 @@ -From f0420b201f2fb5286ccf5657faa6b38cd2680e10 Mon Sep 17 00:00:00 2001 +From 3fee46c7e50f432fbd5c97c60b918d71c91f1adc Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Thu, 8 Apr 2021 14:08:06 +0800 -Subject: [PATCH 2/2] support to override /usr/bin/arch-test +Subject: [PATCH] support to override /usr/bin/arch-test Upstream-Status: Submitted [https://salsa.debian.org/installer-team/debootstrap/-/merge_requests/55] @@ -11,12 +11,12 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/debootstrap b/debootstrap -index 9b9e58d..a3cf3af 100755 +index 552c8d6..11a9465 100755 --- a/debootstrap +++ b/debootstrap @@ -51,6 +51,10 @@ INRELEASE_PATH="" + DEF_MIRROR="http://deb.debian.org/debian" - DEF_HTTPS_MIRROR="https://deb.debian.org/debian" +if [ -z "$ARCH_TEST" ]; then + ARCH_TEST="/usr/bin/arch-test" @@ -25,7 +25,7 @@ index 9b9e58d..a3cf3af 100755 # set $CONTAINER detect_container -@@ -645,12 +649,12 @@ fi +@@ -661,12 +665,12 @@ fi ########################################################################### @@ -43,5 +43,5 @@ index 9b9e58d..a3cf3af 100755 ret=3 fi -- -2.17.1 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch index 2a5f233165..5cd1ce88af 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0001-do-not-hardcode-the-full-path-of-dpkg.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap/0003-do-not-hardcode-the-full-path-of-dpkg.patch @@ -1,4 +1,4 @@ -From e735fb23f46f0c3c7a1144ba6b4050bfc0015a05 Mon Sep 17 00:00:00 2001 +From e92554e57b4aae242cb0416025883ccc2c539d2a Mon Sep 17 00:00:00 2001 From: Hongxu Jia <hongxu.jia@windriver.com> Date: Wed, 2 Jun 2021 13:34:35 +0800 Subject: [PATCH] do not hardcode the full path of dpkg @@ -16,10 +16,10 @@ Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debootstrap b/debootstrap -index a3cf3af..5e96c3e 100755 +index 11a9465..17ab05a 100755 --- a/debootstrap +++ b/debootstrap -@@ -538,7 +538,7 @@ fi +@@ -551,7 +551,7 @@ fi if in_path dpkg && \ dpkg --print-architecture >/dev/null 2>&1; then @@ -29,5 +29,5 @@ index a3cf3af..5e96c3e 100755 udpkg --print-architecture >/dev/null 2>&1; then HOST_ARCH=$(/usr/bin/udpkg --print-architecture) -- -2.27.0 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb index c28a51749c..d4783b3549 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.132.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/debootstrap/debootstrap_1.0.137.bb @@ -2,16 +2,16 @@ SUMMARY = "Install a Debian system into a subdirectory" HOMEPAGE = "https://wiki.debian.org/Debootstrap" SECTION = "devel" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://debian/copyright;md5=1e68ced6e1689d4cd9dac75ff5225608" +LIC_FILES_CHKSUM = "file://debian/copyright;md5=e7b45429ef05610abf91ac199fdb3a6e" SRC_URI = "\ ${DEBIAN_MIRROR}/main/d/debootstrap/debootstrap_${PV}.tar.gz \ file://0001-support-to-override-usr-sbin-and-usr-share.patch \ file://0002-support-to-override-usr-bin-arch-test.patch \ - file://0001-do-not-hardcode-the-full-path-of-dpkg.patch \ + file://0003-do-not-hardcode-the-full-path-of-dpkg.patch \ " -SRC_URI[sha256sum] = "d963a465314ac0e8fd5392573def042e6663e8edf3d08ace4bbd0d27ee8431f7" +SRC_URI[sha256sum] = "666927457ee4b0b3e68e55a0efbf3fb69189610b7abbd534017d7032cb3ae833" S = "${WORKDIR}/debootstrap" diff --git a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb index 8bd0992bd6..16a4250b2d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/doxygen/doxygen_1.9.3.bb @@ -12,6 +12,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.src.tar.gz \ SRC_URI:append:class-native = " file://doxygen-native-only-check-python3.patch" SRC_URI[sha256sum] = "f352dbc3221af7012b7b00935f2dfdc9fb67a97d43287d2f6c81c50449d254e0" +UPSTREAM_CHECK_URI = "https://github.com/doxygen/doxygen/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + inherit cmake python3native EXTRA_OECMAKE += "\ diff --git a/meta-openembedded/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb b/meta-openembedded/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb index 2c594d229e..b567f11f5c 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/editorconfig/editorconfig-core-c_0.12.9.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=38f617473e9f7373b5e79baf437accf8" SRC_URI = "git://github.com/editorconfig/editorconfig-core-c.git;protocol=https;branch=master" S = "${WORKDIR}/git" -SRCREV = "fd8cf1e94ecf4e6e4493833f96140cf9bd17578e" +SRCREV = "e082c947e7f7b14240195d55c060a6e1eda1b0a1" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb index 183554e2c8..3103fd0091 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/flatbuffers.bb @@ -23,6 +23,11 @@ EXTRA_OECMAKE:append:class-target = " -DFLATBUFFERS_FLATC_EXECUTABLE=${STAGING_B inherit cmake python3native +rm_flatc_cmaketarget_for_target() { + rm -f "${SYSROOT_DESTDIR}/${libdir}/cmake/flatbuffers/FlatcTargets.cmake" +} +SYSROOT_PREPROCESS_FUNCS:class-target += "rm_flatc_cmaketarget_for_target" + FILES:${PN}-compiler = "${bindir}" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb index 5d3c73fd9a..1fab013580 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/flatbuffers/python3-flatbuffers.bb @@ -12,4 +12,4 @@ RDEPENDS:${PN} = "flatbuffers" inherit setuptools3 -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch b/meta-openembedded/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch deleted file mode 100644 index a01b28ac6d..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/files/add_suffix_to_convert_binary_used_in_Makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -Subject: Modify binary name "convert" to "convert.im7" - -The change is needed to resolve the below compilation error -after giflib version upgrade. Log data follows: -| DEBUG: Executing shell function do_compile -| NOTE: make -j 8 -| make -C doc -| make[1]: Entering directory '../giflib/5.2.2/giflib-5.2.2/doc' -| convert ../pic/gifgrid.gif -resize 50x50 giflib-logo.gif -| make[1]: convert: No such file or directory -| make[1]: *** [Makefile:46: giflib-logo.gif] Error 127 -| make[1]: Leaving directory '../giflib/5.2.2/giflib-5.2.2/doc' -| make: *** [Makefile:93: all] Error 2 -| ERROR: oe_runmake failed - -Added dependency on ImageMagick which includes "convert" utility, -to ensure availability of required tool during compilation process. - -This patch updates the binary name used in Makefile from -"convert" to "convert.im7" for resizing the logo image used in HTML -documentation as Imagemagick installs binary in this format. - -Below commits justify the cause of adding the suffix to binaries -provided by ImageMagic package: -https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=dcbb49f707e7ad9bf755dd3275ffc442154b8144 -https://git.openembedded.org/meta-openembedded/commit/meta-oe/recipes-support/imagemagick?id=6e0c24e9b3f9d430dec57f61f8c12c74bca5375d - -Signed-off-by: Bhabu Bindu <bhabubindu@kpit.com> -Upstream-Status: Inappropriate [OE specific] - -=================================================================== ---- a/doc/Makefile -+++ b/doc/Makefile -@@ -43,7 +43,7 @@ - - # Logo image file for HTML docs - giflib-logo.gif: ../pic/gifgrid.gif -- convert $^ -resize 50x50 $@ -+ convert.im7 $^ -resize 50x50 $@ - - # Philosophical choice: the website gets the internal manual pages - allhtml: $(XMLALL:.xml=.html) giflib-logo.gif diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch new file mode 100644 index 0000000000..dc87ed60b9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib/0001-Makefile-fix-typo-in-soname-argument.patch @@ -0,0 +1,34 @@ +From 7f0cd4b6b56183b0afbefd01425e5ebd2b8733b4 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Mon, 8 Jul 2024 13:18:11 +0200 +Subject: [PATCH] Makefile: fix typo in soname argument + +* introduced in: + https://sourceforge.net/p/giflib/code/ci/b65c7ac2905c0842e7977a7b51d83af4486ca7b8/ + there is no LIBUTILMAJOR variable only LIBUTILSOMAJOR leading to: + + ld: fatal error: -soname: must take a non-empty argument + collect2: error: ld returned 1 exit status + + with some linkers like GOLD + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Submitted [https://sourceforge.net/p/giflib/code/merge-requests/17/] + + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 87966a9..41b149e 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ $(LIBUTILSO): $(UOBJECTS) $(UHEADERS) + ifeq ($(UNAME), Darwin) + $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(OBJECTS) -o $(LIBUTILSO) + else +- $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILMAJOR) -o $(LIBUTILSO) $(UOBJECTS) ++ $(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS) + endif + + libutil.a: $(UOBJECTS) $(UHEADERS) diff --git a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb index 7d8a175fe3..aa47f93095 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/giflib/giflib_5.2.2.bb @@ -5,14 +5,16 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ae11c61b04b2917be39b11f78d71519a" CVE_PRODUCT = "giflib_project:giflib" -DEPENDS = "xmlto-native imagemagick-native" +DEPENDS = "xmlto-native" SRC_URI = "${SOURCEFORGE_MIRROR}/giflib/${BP}.tar.gz \ - file://add_suffix_to_convert_binary_used_in_Makefile.patch" + https://sourceforge.net/p/giflib/code/ci/d54b45b0240d455bbaedee4be5203d2703e59967/tree/doc/giflib-logo.gif?format=raw;subdir=${BP}/doc;name=logo;downloadfilename=giflib-logo.gif \ + file://0001-Makefile-fix-typo-in-soname-argument.patch \ +" +SRC_URI[logo.sha256sum] = "1a54383986adad1521d00e003b4c482c27e8bc60690be944a1f3319c75abc2c9" SRC_URI[sha256sum] = "be7ffbd057cadebe2aa144542fd90c6838c6a083b5e8a9048b8ee3b66b29d5fb" - do_install() { # using autotools's default will end up in /usr/local oe_runmake DESTDIR=${D} PREFIX=${prefix} LIBDIR=${libdir} install diff --git a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb index d11751a4b2..72c4036be2 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/glade/glade_3.22.2.bb @@ -24,3 +24,10 @@ SRC_URI[sha256sum] = "edefa6eb24b4d15bd52589121dc109bc08c286157c41288deb74dd9cc3 EXTRA_OECONF += "--disable-man-pages" FILES:${PN} += "${datadir}/glade ${datadir}/metainfo ${libdir}/glade/modules/libgladegtk.so" + +# http://errors.yoctoproject.org/Errors/Details/766882/ +# glade-3.22.2/gladeui/glade-widget.c:1822:36: error: assignment to 'GtkWidget *' {aka 'struct _GtkWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:920:23: error: assignment to 'GladeProperty *' {aka 'struct _GladeProperty *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:1253:21: error: assignment to 'GladeWidget *' {aka 'struct _GladeWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +# glade-3.22.2/gladeui/glade-command.c:1419:21: error: assignment to 'GladeWidget *' {aka 'struct _GladeWidget *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.66.1.bb index 63c696a623..7968d63a87 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.60.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/grpc/grpc_1.66.1.bb @@ -20,8 +20,8 @@ RDEPENDS:${PN}-dev:append:class-native = " ${PN}-compiler" # RDEPENDS:${PN}-dev += "${PN}-compiler" S = "${WORKDIR}/git" -SRCREV_grpc = "e5ae3b6b44bf3b64d24bfb4b4f82556239b986db" -BRANCH = "v1.60.x" +SRCREV_grpc = "e821cdc231bda9ee93139a6daab6311dd8953832" +BRANCH = "v1.66.x" SRC_URI = "gitsm://github.com/grpc/grpc.git;protocol=https;name=grpc;branch=${BRANCH} \ file://0001-cmake-Link-with-libatomic-on-rv32-rv64.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb index be2c0f5394..599fd2c373 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/heaptrack/heaptrack_1.2.0.bb @@ -30,3 +30,33 @@ COMPATIBLE_HOST:riscv32 = "null" COMPATIBLE_HOST:riscv64 = "null" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766879/ +# buildResult: +# variable: "LIBUNWIND_HAS_UNW_BACKTRACE" +# cached: true +# stdout: | +# Change Dir: '/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO' +# +# Run Build Command(s): ninja -v cmTC_51d86 +# [1/2] ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c +# FAILED: CMakeFiles/cmTC_51d86.dir/src.c.o +# ccache /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native/usr/bin/aarch64-webos-linux/aarch64-webos-linux-gcc --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -DLIBUNWIND_HAS_UNW_BACKTRACE -mcpu=cortex-a72+crc -mbranch-protection=standard -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -Werror=return-type --sysroot=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot -O2 -pipe -g -feliminate-unused-debug-types -fcanon-prefix-map -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/git=/usr/src/debug/heaptrack/1.2.0 -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build=/usr/src/debug/heaptrack/1.2.0 -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fmacro-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot= -fdebug-prefix-map=/OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/recipe-sysroot-native= -o CMakeFiles/cmTC_51d86.dir/src.c.o -c /OE/lge/build/webos/styhead/BUILD/work/raspberrypi4_64-webos-linux/heaptrack/1.2.0/build/CMakeFiles/CMakeScratch/TryCompile-kguYrO/src.c +# src.c: In function 'main': +# src.c:3:43: error: passing argument 1 of 'unw_backtrace' from incompatible pointer type [-Wincompatible-pointer-types] +# 3 | int main() { void* buf[10]; unw_backtrace(&buf, 10); return 0; } +# | ^~~~ +# | | +# | void * (*)[10] +# In file included from ../../../../recipe-sysroot/usr/include/libunwind-aarch64.h:232, +# from ../../../../recipe-sysroot/usr/include/libunwind-64.h:7, +# from ../../../../recipe-sysroot/usr/include/libunwind.h:27, +# from src.c:2: +# ../../../../recipe-sysroot/usr/include/libunwind-common.h:290:27: note: expected 'void **' but argument is of type 'void * (*)[10]' +# 290 | extern int unw_backtrace (void **, int); +# | ^~~~~~~ +# ninja: build stopped: subcommand failed. +# +# exitCode: 1 +# +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb index c54dc94666..ade9f35d18 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsoncpp/jsoncpp_1.9.6.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926" PE = "1" -SRCREV = "5defb4ed1a4293b8e2bf641e16b156fb9de498cc" +SRCREV = "89e2973c754a9c02a49974d839779b151e95afd6" SRC_URI = "git://github.com/open-source-parsers/jsoncpp;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb index 544922f05d..f0c60e5a86 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/jsonrpc/jsonrpc_1.4.1.bb @@ -25,4 +25,8 @@ EXTRA_OECMAKE += "-DCOMPILE_TESTS=NO -DCOMPILE_STUBGEN=NO -DCOMPILE_EXAMPLES=NO -DCMAKE_LIBRARY_PATH=${libdir} \ " +do_install:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/libjson-rpc-cpp/cmake/libjson-rpc-cppTargets.cmake +} + FILES:${PN}-dev += "${libdir}/libjson-rpc-cpp/cmake" diff --git a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb index b894f0ba03..efa8c936b4 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb @@ -20,6 +20,9 @@ SRC_URI = "git://gitlab.com/ymorin/kconfig-frontends.git;protocol=https;branch=4 SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb index 16816e62d8..f071f579df 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ldns/ldns_1.8.4.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=34330f15b2b4abbbaaa7623f79a6a019" SRC_URI = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${PV}.tar.gz" -SRC_URI[sha256sum] = "c3f72dd1036b2907e3a56e6acf9dfb2e551256b3c1bbd9787942deeeb70e7860" +SRC_URI[sha256sum] = "838b907594baaff1cd767e95466a7745998ae64bc74be038dccc62e2de2e4247" DEPENDS = "openssl" @@ -19,5 +19,6 @@ do_install:append() { sed -e 's@[^ ]*-ffile-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*-fdebug-prefix-map=[^ "]*@@g' \ -e 's@[^ ]*-fmacro-prefix-map=[^ "]*@@g' \ - -i ${D}${libdir}/pkgconfig/*.pc + -e 's@${RECIPE_SYSROOT}@@g' \ + -i ${D}${libdir}/pkgconfig/*.pc ${D}${bindir}/ldns-config } diff --git a/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch b/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch new file mode 100644 index 0000000000..7c500e0b54 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail/0001-Check-for-correct-fts-module.patch @@ -0,0 +1,91 @@ +From 0db4af09f1bf4456527b5f6ec60fc1305e770c4c Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Tue, 9 Jul 2024 15:19:35 +0100 +Subject: [PATCH] configure.ac: improve fts checks + +The current code checks explicitly for musl and if so uses pkg-config to +find fts-standalone. This is suboptimal because musl may not be the only +libc to need a standalone fts implementation, and fts-standalone is an +old gentoo-specific name[1] so libabigail won't build on any other system +against musl. + +Instead, use AC_SEARCH_LIBS to look for fts_open in libc then libfts. Do +this before the check for behaviour just in case someone has a standalone +and broken implementation. I assume that the standalone fts is installed +on the standard search path, which should be a fair assumption. + +As we're not using pkg-config anymore the required link flags are now in +LIBS, so remove all instances of FTS_CFLAGS and FTS_LIBS. + +[1] https://gitweb.gentoo.org/repo/gentoo.git/commit/sys-libs/fts-standalone?id=a403fe6c61d1aaeecd58d521f3def2f6d3513449 + +Upstream-Status: Submitted [https://sourceware.org/pipermail/libabigail/2024q3/005973.html] +Signed-off-by: Ross Burton <ross.burton@arm.com> +--- + configure.ac | 9 ++++----- + src/Makefile.am | 4 ++-- + tools/Makefile.am | 2 -- + 3 files changed, 6 insertions(+), 9 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e118a9c0..0aff2ec2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -281,6 +281,10 @@ fi + + AC_SUBST(VISIBILITY_FLAGS) + ++# glibc and BSD include fts into their libc, but musl does not so check if we ++# need to explicitly link to the standalone musl-fts. ++AC_SEARCH_LIBS([fts_open], [fts]) ++ + dnl Older glibc had a broken fts that didn't work with Large File Systems. + dnl We want the version that can handler LFS, but include workaround if we + dnl get a bad one. Add define to CFLAGS (not AC_DEFINE it) since we need to +@@ -295,11 +299,6 @@ AS_IF([test "x$ac_cv_bad_fts" = "xyes"], + [CFLAGS="$CFLAGS -DBAD_FTS=1", + CXXFLAGS="$CXXFLAGS -DBAD_FTS=1"]) + +-dnl On musl, we need to find fts-standalone +-AS_CASE( +- [${host_os}], [*-musl*], [ +- PKG_CHECK_MODULES([FTS], [fts-standalone]) +-]) + + dnl Check for dependency: libelf, libdw, libebl (elfutils) + dnl Note that we need to use at least elfutils 0.159 but +diff --git a/src/Makefile.am b/src/Makefile.am +index 3044c136..1c98bf84 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -52,12 +52,12 @@ if BTF_READER + libabigail_la_SOURCES += abg-btf-reader.cc + endif + +-libabigail_la_LIBADD = $(DEPS_LIBS) $(FTS_LIBS) ++libabigail_la_LIBADD = $(DEPS_LIBS) + libabigail_la_LDFLAGS = -lpthread -Wl,--as-needed -no-undefined -version-info $(LIBABIGAIL_SO_CURRENT):$(LIBABIGAIL_SO_REVISION):$(LIBABIGAIL_SO_AGE) + + CUSTOM_MACROS = -DABIGAIL_ROOT_SYSTEM_LIBDIR=\"${libdir}\" + + AM_CPPFLAGS=\ +-$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) $(FTS_CFLAGS) \ ++$(CUSTOM_MACROS) $(DEPS_CPPFLAGS) \ + -Wall -I$(abs_top_srcdir) -I$(abs_top_srcdir)/include \ + -I$(abs_top_builddir)/include -I$(abs_top_builddir) +diff --git a/tools/Makefile.am b/tools/Makefile.am +index cbb5ce10..ea2d300c 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -41,8 +41,6 @@ abicompatdir = $(bindir) + + abipkgdiff_SOURCES = abipkgdiff.cc + abipkgdiffdir = $(bindir) +-abipkgdiff_CPPFLAGS = $(FTS_CFLAGS) +-abipkgdiff_LDADD = $(FTS_LIBS) + abipkgdiff_LDFLAGS = $(abs_top_builddir)/src/libabigail.la -pthread + + kmidiff_SOURCES = kmidiff.cc +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb b/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb new file mode 100644 index 0000000000..5c262d2880 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/libabigail/libabigail_2.5.bb @@ -0,0 +1,17 @@ +SUMMARY = "The ABI Generic Analysis and Instrumentation Library" +HOMEPAGE = "https://sourceware.org/libabigail/" + +LICENSE = "Apache-2.0-with-LLVM-exception" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=0bcd48c3bdfef0c9d9fd17726e4b7dab" + +SRC_URI = "http://mirrors.kernel.org/sourceware/${BPN}/${BP}.tar.xz \ + file://0001-Check-for-correct-fts-module.patch \ + " +SRC_URI[sha256sum] = "7cfc4e9b00ae38d87fb0c63beabb32b9cbf9ce410e52ceeb5ad5b3c5beb111f3" + +DEPENDS = "elfutils libxml2" +DEPENDS:append:libc-musl = " fts" + +inherit autotools pkgconfig lib_package + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb index 4f9099ff0f..7e2781bcb0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libgee/libgee_0.20.6.bb @@ -21,3 +21,38 @@ do_configure:prepend() { } SRC_URI[archive.sha256sum] = "1bf834f5e10d60cc6124d74ed3c1dd38da646787fbf7872220b8b4068e476d4d" + +# http://errors.yoctoproject.org/Errors/Details/766884/ +# libgee-0.20.6/gee/concurrentlist.c:1169:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:1175:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2385:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2438:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2460:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2469:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2481:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2640:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2641:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:2750:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:469:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:514:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentlist.c:713:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:3635:185: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:4950:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5378:201: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5428:226: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5480:218: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5530:238: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5532:234: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5623:246: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:5625:242: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7088:194: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7157:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7184:168: error: passing argument 4 of 'gee_hazard_pointer_set_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7198:177: error: passing argument 4 of 'gee_hazard_pointer_get_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/concurrentset.c:7215:185: error: passing argument 4 of 'gee_hazard_pointer_compare_and_exchange_pointer' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hashmap.c:4089:30: error: assignment to 'gboolean (*)(GeeMapIterator *)' {aka 'int (*)(struct _GeeMapIterator *)'} from incompatible pointer type 'gboolean (*)(GeeHashMapNodeIterator *)' {aka 'int (*)(struct _GeeHashMapNodeIterator *)'} [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:430:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:430:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:434:134: error: passing argument 4 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +# libgee-0.20.6/gee/hazardpointer.c:434:171: error: passing argument 5 of 'gee_hazard_pointer_release_policy_swap' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb index 39e18cdafd..131929b30e 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/libubox/libubox_git.bb @@ -22,6 +22,9 @@ SRC_URI = "\ SRCREV = "07413cce72e19520af55dfcbc765484f5ab41dd9" PV = "1.0.1+git" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch deleted file mode 100644 index c896e3ebb0..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ARM-code-has-unreachable-code-after-switch-statement.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 95ff340a74af16cca89fd5c5ca99890821053209 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 22 Apr 2017 00:47:16 -0700 -Subject: [PATCH] ARM code has unreachable code after switch statement move - initialization - -Fixed -sysdeps/linux-gnu/arm/trace.c:173:33: error: statement will never be executed [-Werror=switch-unreachable] - uint32_t operand1, operand2, result = 0; - ^~~~~~ - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - sysdeps/linux-gnu/arm/trace.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c -index 5e51e91..f974d1f 100644 ---- a/sysdeps/linux-gnu/arm/trace.c -+++ b/sysdeps/linux-gnu/arm/trace.c -@@ -155,6 +155,8 @@ arm_get_next_pcs(struct process *proc, - const unsigned cond = BITS(this_instr, 28, 31); - const unsigned opcode = BITS(this_instr, 24, 27); - -+ uint32_t operand1, operand2, result = 0; -+ - if (cond == COND_NV) - switch (opcode) { - arch_addr_t addr; -@@ -170,7 +172,6 @@ arm_get_next_pcs(struct process *proc, - } - else - switch (opcode) { -- uint32_t operand1, operand2, result = 0; - case 0x0: - case 0x1: /* data processing */ - case 0x2: --- -2.12.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch deleted file mode 100644 index a599d0e191..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-Fix-tautological-compare-warning.patch +++ /dev/null @@ -1,261 +0,0 @@ -From 0af8ced6376f2256b9daac301c851e1c99c3b035 Mon Sep 17 00:00:00 2001 -From: Adam Trhon <adam.trhon@tbs-biometrics.com> -Date: Fri, 12 May 2017 13:39:11 +0200 -Subject: [PATCH] Fix tautological compare warning - -By default, gcc ignores warning from code generated by macros -(https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80369). When -ltrace is compiled under icecream the warning *is generated* -(https://github.com/icecc/icecream/issues/202) -and the compilation fails (because of -Werror). - -Upstream-Status: Submitted [ltrace-devel@lists.alioth.debian.org] - -Signed-off-by: Adam Trhon <adam.trhon@tbs-biometrics.com> ---- - filter.c | 4 ++-- - sysdeps/linux-gnu/arm/fetch.c | 2 +- - sysdeps/linux-gnu/arm/trace.c | 2 +- - sysdeps/linux-gnu/ia64/fetch.c | 2 +- - sysdeps/linux-gnu/metag/trace.c | 2 +- - sysdeps/linux-gnu/mips/plt.c | 2 +- - sysdeps/linux-gnu/ppc/fetch.c | 2 +- - sysdeps/linux-gnu/ppc/plt.c | 2 +- - sysdeps/linux-gnu/ppc/trace.c | 4 ++-- - sysdeps/linux-gnu/s390/fetch.c | 2 +- - sysdeps/linux-gnu/s390/trace.c | 4 ++-- - sysdeps/linux-gnu/x86/fetch.c | 2 +- - sysdeps/linux-gnu/x86/trace.c | 4 ++-- - value.c | 4 ++-- - 14 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/filter.c b/filter.c -index ba50c40..a65856d 100644 ---- a/filter.c -+++ b/filter.c -@@ -79,7 +79,7 @@ filter_lib_matcher_name_init(struct filter_lib_matcher *matcher, - { - switch (type) { - case FLM_MAIN: -- assert(type != type); -+ assert(!"Unexpected value of type"); - abort(); - - case FLM_SONAME: -@@ -137,7 +137,7 @@ matcher_matches_library(struct filter_lib_matcher *matcher, struct library *lib) - case FLM_MAIN: - return lib->type == LT_LIBTYPE_MAIN; - } -- assert(matcher->type != matcher->type); -+ assert(!"Unexpected value of matcher->type"); - abort(); - } - -diff --git a/sysdeps/linux-gnu/arm/fetch.c b/sysdeps/linux-gnu/arm/fetch.c -index b500448..8f75fcf 100644 ---- a/sysdeps/linux-gnu/arm/fetch.c -+++ b/sysdeps/linux-gnu/arm/fetch.c -@@ -317,7 +317,7 @@ arch_fetch_retval(struct fetch_context *ctx, enum tof type, - memmove(data, ctx->regs.uregs, sz); - return 0; - } -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - -diff --git a/sysdeps/linux-gnu/arm/trace.c b/sysdeps/linux-gnu/arm/trace.c -index 5e51e91..e76bf63 100644 ---- a/sysdeps/linux-gnu/arm/trace.c -+++ b/sysdeps/linux-gnu/arm/trace.c -@@ -701,7 +701,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) - return (size_t)-2; - - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - } -diff --git a/sysdeps/linux-gnu/ia64/fetch.c b/sysdeps/linux-gnu/ia64/fetch.c -index 171c7a2..ee2fbc7 100644 ---- a/sysdeps/linux-gnu/ia64/fetch.c -+++ b/sysdeps/linux-gnu/ia64/fetch.c -@@ -409,7 +409,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type, - case ARGTYPE_ARRAY: - /* Arrays decay into pointers. XXX Fortran? */ - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - } -diff --git a/sysdeps/linux-gnu/metag/trace.c b/sysdeps/linux-gnu/metag/trace.c -index ad5fffe..7a843d6 100644 ---- a/sysdeps/linux-gnu/metag/trace.c -+++ b/sysdeps/linux-gnu/metag/trace.c -@@ -142,7 +142,7 @@ get_regval_from_unit(enum metag_unitnum unit, unsigned int reg, - return regs->ax[reg][0]; - /* We really shouldn't be here. */ - default: -- assert(unit != unit); -+ assert(!"Unexpected value of unit"); - abort(); - } - return 0; -diff --git a/sysdeps/linux-gnu/mips/plt.c b/sysdeps/linux-gnu/mips/plt.c -index c7c10ac..ca2307d 100644 ---- a/sysdeps/linux-gnu/mips/plt.c -+++ b/sysdeps/linux-gnu/mips/plt.c -@@ -651,7 +651,7 @@ mips_stub_bp_continue(struct breakpoint *bp, struct process *proc) - break; - } - -- assert(bp->libsym->arch.type != bp->libsym->arch.type); -+ assert(!"Unexpected value of bp->libsym->arch.type"); - abort(); - } - -diff --git a/sysdeps/linux-gnu/ppc/fetch.c b/sysdeps/linux-gnu/ppc/fetch.c -index c6cbd71..5db5675 100644 ---- a/sysdeps/linux-gnu/ppc/fetch.c -+++ b/sysdeps/linux-gnu/ppc/fetch.c -@@ -502,7 +502,7 @@ allocate_argument(struct fetch_context *ctx, struct process *proc, - case ARGTYPE_ARRAY: - /* Arrays decay into pointers. XXX Fortran? */ - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - -diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c -index 5f81889..781da03 100644 ---- a/sysdeps/linux-gnu/ppc/plt.c -+++ b/sysdeps/linux-gnu/ppc/plt.c -@@ -1085,7 +1085,7 @@ ppc_plt_bp_continue(struct breakpoint *bp, struct process *proc) - break; - } - -- assert(bp->libsym->arch.type != bp->libsym->arch.type); -+ assert(!"Unexpected value of bp->libsym->arch.type"); - abort(); - } - -diff --git a/sysdeps/linux-gnu/ppc/trace.c b/sysdeps/linux-gnu/ppc/trace.c -index 5aab538..caa6035 100644 ---- a/sysdeps/linux-gnu/ppc/trace.c -+++ b/sysdeps/linux-gnu/ppc/trace.c -@@ -217,7 +217,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) - return (size_t)-2; - - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - break; - } -@@ -231,7 +231,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) - - switch (info->type) { - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - break; - -diff --git a/sysdeps/linux-gnu/s390/fetch.c b/sysdeps/linux-gnu/s390/fetch.c -index 4ad5951..4721c30 100644 ---- a/sysdeps/linux-gnu/s390/fetch.c -+++ b/sysdeps/linux-gnu/s390/fetch.c -@@ -266,7 +266,7 @@ arch_fetch_arg_next(struct fetch_context *ctx, enum tof type, - return allocate_gpr(ctx, proc, info, valuep, sz); - - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - return -1; -diff --git a/sysdeps/linux-gnu/s390/trace.c b/sysdeps/linux-gnu/s390/trace.c -index 78b04c3..24f7801 100644 ---- a/sysdeps/linux-gnu/s390/trace.c -+++ b/sysdeps/linux-gnu/s390/trace.c -@@ -213,7 +213,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) - return (size_t)-2; - - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - } -@@ -226,7 +226,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) - - switch (info->type) { - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - break; - - case ARGTYPE_CHAR: -diff --git a/sysdeps/linux-gnu/x86/fetch.c b/sysdeps/linux-gnu/x86/fetch.c -index 6868101..ae2ed79 100644 ---- a/sysdeps/linux-gnu/x86/fetch.c -+++ b/sysdeps/linux-gnu/x86/fetch.c -@@ -523,7 +523,7 @@ classify(struct process *proc, struct fetch_context *context, - - default: - /* Unsupported type. */ -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - abort(); -diff --git a/sysdeps/linux-gnu/x86/trace.c b/sysdeps/linux-gnu/x86/trace.c -index 6a1a6a5..d8d2115 100644 ---- a/sysdeps/linux-gnu/x86/trace.c -+++ b/sysdeps/linux-gnu/x86/trace.c -@@ -145,7 +145,7 @@ arch_type_sizeof(struct process *proc, struct arg_type_info *info) - return (size_t)-2; - - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - } - } -@@ -158,7 +158,7 @@ arch_type_alignof(struct process *proc, struct arg_type_info *info) - - switch (info->type) { - default: -- assert(info->type != info->type); -+ assert(!"Unexpected value of info->type"); - abort(); - break; - -diff --git a/value.c b/value.c -index 2125ba9..30edb4e 100644 ---- a/value.c -+++ b/value.c -@@ -363,7 +363,7 @@ value_set_word(struct value *value, long word) - u.u64 = word; - break; - default: -- assert(sz != sz); -+ assert(!"Unexpected value of sz"); - abort(); - } - -@@ -414,7 +414,7 @@ value_extract_word(struct value *value, long *retp, - *retp = (long)u.u64; - return 0; - default: -- assert(sz != sz); -+ assert(!"Unexpected value of sz"); - abort(); - } - } --- -2.12.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch deleted file mode 100644 index 9def41ca60..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ensure-the-struct-pointers-are-null-initilized.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 67a8fa478a4484bc4dbfb3ac74e11be1dd5af594 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 23 Dec 2019 19:35:48 -0800 -Subject: [PATCH] ensure the struct pointers are null initilized - -Do not delete if pointer is already null - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - expr.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/expr.c b/expr.c -index 4059a32..5ffd0ad 100644 ---- a/expr.c -+++ b/expr.c -@@ -189,10 +189,8 @@ int - expr_clone(struct expr_node *retp, const struct expr_node *node) - { - *retp = *node; -- -+ struct expr_node *nlhs = 0, *nrhs = 0; - switch (node->kind) { -- struct expr_node *nlhs; -- struct expr_node *nrhs; - - case EXPR_OP_ARGNO: - case EXPR_OP_SELF: -@@ -236,8 +234,10 @@ expr_clone(struct expr_node *retp, const struct expr_node *node) - if (expr_alloc_and_clone(&nlhs, node->lhs, node->own_lhs) < 0) { - if (node->kind == EXPR_OP_CALL2 - && node->u.call.own_rhs) { -- expr_destroy(nrhs); -- free(nrhs); -+ if (nrhs) { -+ expr_destroy(nrhs); -+ free(nrhs); -+ } - return -1; - } - } --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch deleted file mode 100644 index 4793e561c0..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-ppc-plt-do-not-free-symbol-libsym.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f47672bed5905ae382e80b09dafca9a8da45aa67 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 19 Apr 2022 18:44:36 -0700 -Subject: [PATCH] ppc/plt: do not free symbol libsym - -delete_symbol_chain() will call free as well if sybol is non-null -it also fixes use-after-free warnings that compiler emits - -Upstream-Status: Submitted [https://gitlab.com/cespedes/ltrace/-/merge_requests/2] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - sysdeps/linux-gnu/ppc/plt.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/sysdeps/linux-gnu/ppc/plt.c b/sysdeps/linux-gnu/ppc/plt.c -index 5f81889..7c1c025 100644 ---- a/sysdeps/linux-gnu/ppc/plt.c -+++ b/sysdeps/linux-gnu/ppc/plt.c -@@ -687,7 +687,6 @@ arch_elf_add_func_entry(struct process *proc, struct ltelf *lte, - if (libsym == NULL - || library_symbol_init(libsym, addr, full_name, 1, - LS_TOPLT_NONE) < 0) { -- free(libsym); - delete_symbol_chain(libsym); - libsym = NULL; - fprintf(stderr, "Couldn't add symbol %s" --- -2.36.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch new file mode 100644 index 0000000000..3e166f0deb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch @@ -0,0 +1,34 @@ +From f2f6082cb112cf3b8a6a5bfc989e4a4f6a1bff27 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 3 Sep 2024 20:41:20 +0000 +Subject: [PATCH] proc: Make PROC_PID_FILE not use variable length array + +This helps in compiling with clang which is not happy about VLA + +| ../../../git/sysdeps/linux-gnu/proc.c:70:3: error: variable length array folded to constant array as an extension [-Werror,-Wgnu-folding-constant] +| 70 | PROC_PID_FILE(proc_exe, "/proc/%d/exe", pid); +| | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +| ../../../git/sysdeps/linux-gnu/proc.c:59:11: note: expanded from macro 'PROC_PID_FILE' +| 59 | char VAR[strlen(FORMAT) + 6]; \ +| | ^~~~~~~~~~~~~~~~~~ + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + sysdeps/linux-gnu/proc.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c +index b954997..f37e4e8 100644 +--- a/sysdeps/linux-gnu/proc.c ++++ b/sysdeps/linux-gnu/proc.c +@@ -56,7 +56,8 @@ + #define MAX_DELAY 100000 /* 100000 microseconds = 0.1 seconds */ + + #define PROC_PID_FILE(VAR, FORMAT, PID) \ +- char VAR[strlen(FORMAT) + 6]; \ ++ enum { buflen_ ## VAR = strlen(FORMAT)}; \ ++ char VAR[buflen_ ## VAR + 6]; \ + sprintf(VAR, FORMAT, PID) + + /* diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch deleted file mode 100644 index 65c7d535eb..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace/0001-replace-readdir_r-with-readdir.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 64f98f84fd88797e219f9dde1ca387fee4b509f0 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 24 Apr 2016 16:58:17 -0700 -Subject: [PATCH] replace readdir_r with readdir - -glibc 2.24 has deprecated readdir_r - -https://sourceware.org/ml/libc-alpha/2016-02/msg00093.html - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - sysdeps/linux-gnu/proc.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/sysdeps/linux-gnu/proc.c b/sysdeps/linux-gnu/proc.c -index 953fd86..edb716d 100644 ---- a/sysdeps/linux-gnu/proc.c -+++ b/sysdeps/linux-gnu/proc.c -@@ -242,9 +242,10 @@ process_tasks(pid_t pid, pid_t **ret_tasks, size_t *ret_n) - size_t alloc = 0; - - while (1) { -- struct dirent entry; - struct dirent *result; -- if (readdir_r(d, &entry, &result) != 0) { -+ errno = 0; -+ result = readdir(d); -+ if (errno != 0) { - fail: - free(tasks); - closedir(d); --- -2.8.0 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb index 63971970cf..a3ddf2a76b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/ltrace/ltrace_git.bb @@ -11,27 +11,23 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" PE = "1" PV = "7.91+git" -SRCREV = "c22d359433b333937ee3d803450dc41998115685" +SRCREV = "8eabf684ba6b11ae7a1a843aca3c0657c6329d73" DEPENDS = "elfutils" -SRC_URI = "git://github.com/sparkleholic/ltrace.git;protocol=https;branch=master \ +SRC_URI = "git://gitlab.com/cespedes/ltrace.git;protocol=https;branch=main \ file://configure-allow-to-disable-selinux-support.patch \ - file://0001-replace-readdir_r-with-readdir.patch \ file://0001-Use-correct-enum-type.patch \ file://0002-Fix-const-qualifier-error.patch \ - file://0001-ARM-code-has-unreachable-code-after-switch-statement.patch \ - file://0001-Fix-tautological-compare-warning.patch \ file://0001-Add-support-for-mips64-n32-n64.patch \ file://0001-configure-Recognise-linux-musl-as-a-host-OS.patch \ file://0001-mips-plt.c-Delete-include-error.h.patch \ file://0001-move-fprintf-into-same-block-where-modname-and-symna.patch \ file://0001-hook-Do-not-append-int-to-std-string.patch \ file://0001-Bug-fix-for-data-type-length-judgment.patch \ - file://0001-ensure-the-struct-pointers-are-null-initilized.patch \ file://0001-ppc-Remove-unused-host_powerpc64-function.patch \ file://0001-mips-Use-hardcodes-values-for-ABI-syscall-bases.patch \ - file://0001-ppc-plt-do-not-free-symbol-libsym.patch \ file://0001-Fix-type-of-single-bit-bitfields.patch \ + file://0001-proc-Make-PROC_PID_FILE-not-use-variable-length-arra.patch \ " SRC_URI:append:libc-musl = " file://add_ppc64le.patch" diff --git a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb index 240271d410..4189217541 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/luajit/luajit_git.bb @@ -21,7 +21,7 @@ BBCLASSEXTEND = "native" # Host luajit needs to be compiled with the same pointer size # If you want to cross-compile to any 32 bit target on an x64 OS, # you need to install the multilib development package (e.g. -# libc6-dev-i386 on Debian/Ubuntu) and build a 32 bit host part +# libc6-dev:i386 on Debian/Ubuntu) and build a 32 bit host part # (HOST_CC="gcc -m32"). BUILD_CC_ARCH:append = " ${@['-m32',''][d.getVar('SITEINFO_BITS') != '32']}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb index 9445856730..b44c6d6663 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mcpp/mcpp_2.7.2.bb @@ -10,9 +10,15 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ SRC_URI[md5sum] = "512de48c87ab023a69250edc7a0c7b05" SRC_URI[sha256sum] = "3b9b4421888519876c4fc68ade324a3bbd81ceeb7092ecdbbc2055099fcb8864" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/mcpp/files/mcpp/" +UPSTREAM_CHECK_REGEX = "${BPN}/V\.(?P<pver>\d+(\.\d+)+)" + inherit autotools EXTRA_OECONF = " --enable-mcpplib " BBCLASSEXTEND = "native nativesdk" +# http://errors.yoctoproject.org/Errors/Details/766883/ +# mcpp-2.7.2/src/expand.c:713:21: error: assignment to 'char *' from incompatible pointer type 'LOCATION *' {aka 'struct location *'} [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/run-ptest b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/run-ptest new file mode 100644 index 0000000000..865da9f69e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/run-ptest @@ -0,0 +1,27 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH +# +# SPDX-License-Identifier: MIT + +fail_count=0 +all_count=0 + +for test_suite in tests/test_* +do + if "./$test_suite" + then + echo "PASS: $test_suite" + else + echo "FAIL: $test_suite" + fail_count=$((fail_count + 1)) + fi + all_count=$((all_count + 1)) +done + +if [ $fail_count -eq 0 ] +then + echo "PASS: All $all_count tests passed" +else + echo "FAIL: $fail_count of $all_count tests failed" +fi diff --git a/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh new file mode 100644 index 0000000000..a74975d392 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool/test_read_write_plainfiles.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH +# +# SPDX-License-Identifier: MIT + +# This script verifies the behavior of memtool against plain files. + +readonly PLAIN_FILE=$(mktemp) +FAIL_COUNT=0 + +setup() { + echo "Hello World!" >"$PLAIN_FILE" +} + +teardown() { + rm "$PLAIN_FILE" +} + +verify() { + ACTUAL=$1 + EXPECTED=$2 + TEST_NAME=$3 + + if [ "$ACTUAL" = "$EXPECTED" ]; then + echo "pass: $TEST_NAME" + else + echo "FAIL: $TEST_NAME" + echo " Expected: $EXPECTED" + echo " Actual: $ACTUAL" + FAIL_COUNT=$((FAIL_COUNT + 1)) + fi +} + +# Test Case: Verifies that the expected string of bytes is read from a plain file starting from +# the offset 6 and reading 6 bytes. +test_memtool_read() { + EXPECTED="00000006: 57 6f 72 6c 64 21 World!" + ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6) + verify "$ACTUAL" "$EXPECTED" "memtool read from plain file" +} + +# Test Case 2: Verifies that the expected string of bytes is written to a plain file starting from +# and then read the result. +test_memtool_write() { + # Usage of 'od' ensures correct endianess. + readonly replace_str_bytes=$(echo "Yocto!" | od -t d4 -A n) + + # shellcheck disable=SC2086 # We want to pass the bytes as separate arguments. + memtool mw -d "$PLAIN_FILE" 0x6+6 $replace_str_bytes + + EXPECTED="00000006: 59 6f 63 74 6f 21 Yocto!" + ACTUAL=$(memtool md -s "$PLAIN_FILE" -b 0x6+6) + verify "$ACTUAL" "$EXPECTED" "memtool write to plain file" +} + +for test_case in $(declare -F | grep test_memtool_ | cut -f 3 -d ' '); do + setup + $test_case + teardown +done + +if [ $FAIL_COUNT -eq 0 ]; then + echo "Test Passed: memtool plain file read/write functionality is correct." + exit 0 +else + echo "Test FAILED: memtool plain file read/write functionality is incorrect. Check the logs." + exit 1 +fi diff --git a/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb new file mode 100644 index 0000000000..1e2e93bcd5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/memtool/memtool_2018.03.0.bb @@ -0,0 +1,31 @@ +# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH +# +# SPDX-License-Identifier: MIT + +SUMMARY = "A tool to manipulate and read memory mapped registers" +DESCRIPTION = "memtool is a program that allows to access memory mapped registers. This is useful \ +to inspect and modify registers from the command line. memtool can also operate on plain files, \ +and access PHY registers." +HOMEPAGE = "https://github.com/pengutronix/memtool" +BUGTRACKER = "https://github.com/pengutronix/memtool/issues" +SECTION = "devtool" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +SRC_URI = " \ + http://www.pengutronix.de/software/memtool/downloads/memtool-${PV}.tar.xz \ + file://run-ptest \ + file://test_read_write_plainfiles.sh \ +" + +SRC_URI[sha256sum] = "87cb7175266ff3a00a9c1f541c4c6c93693ffbe8dcc0d97a60d13c45ff860900" + +inherit autotools ptest + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${UNPACKDIR}/test_* ${D}${PTEST_PATH}/tests +} + +RDEPENDS:${PN}-ptest += "bash coreutils" diff --git a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb index 89e6744dca..395a330790 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mercurial/mercurial_6.6.3.bb @@ -34,3 +34,4 @@ PACKAGES =+ "${PN}-python" FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR} ${datadir}" FILES:${PN}-python = "${nonarch_libdir}/${PYTHON_DIR}" +CVE_STATUS[CVE-2022-43410] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different mercurial package compared to the one which has the CVE issue." diff --git a/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb b/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb index 4bb3e62d9f..73d434cba5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/microcom/microcom_2023.09.0.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c9f7c009791eaa4b9ca90dc4c9538d24" SRC_URI = "https://github.com/pengutronix/microcom/releases/download/v${PV}/microcom-${PV}.tar.xz" SRC_URI[sha256sum] = "ef42184bb35c9762b3e9c70748696f7478efacad8412a88aaf2d9a6a500231a1" +UPSTREAM_CHECK_URI = "${HOMEPAGE}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + DEPENDS = "readline" inherit autotools update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb index 9fd8c3bb7b..f9ff07740d 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/mpich/mpich_4.2.2.bb @@ -6,7 +6,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=7a88f0d96d0d7396a7c66bf353235b62" SRC_URI = "http://www.mpich.org/static/downloads/${PV}/mpich-${PV}.tar.gz" -SRC_URI[sha256sum] = "23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7" +SRC_URI[sha256sum] = "883f5bb3aeabf627cb8492ca02a03b191d09836bbe0f599d8508351179781d41" RDEPENDS:${PN} += "bash perl libxml2" diff --git a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb index 5f5507bc74..ccbaf9cea7 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/msgpack/msgpack-cpp_6.1.1.bb @@ -8,7 +8,10 @@ LIC_FILES_CHKSUM = "file://NOTICE;md5=7a858c074723608e08614061dc044352 \ " SRC_URI = "https://github.com/msgpack/msgpack-c/releases/download/cpp-${PV}/msgpack-cxx-${PV}.tar.gz" -SRC_URI[sha256sum] = "23ede7e93c8efee343ad8c6514c28f3708207e5106af3b3e4969b3a9ed7039e7" +SRC_URI[sha256sum] = "5fd555742e37bbd58d166199e669f01f743c7b3c6177191dd7b31fb0c37fa191" + +UPSTREAM_CHECK_URI = "https://github.com/msgpack/msgpack-c/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/msgpack-cxx-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.18/oe-npm-cache index eb0f143eae..eb0f143eae 100755 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.13/oe-npm-cache +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-20.18/oe-npm-cache diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.18.bb index d4b818f967..d4b818f967 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.13.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs-oe-cache-native_20.18.bb diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch deleted file mode 100644 index 39026d0742..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-build-fix-build-with-Python-3.12.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 656f6c91f1da7f1e1ffb01e2de7d9026a84958b5 Mon Sep 17 00:00:00 2001 -From: Luigi Pinca <luigipinca@gmail.com> -Date: Wed, 8 Nov 2023 21:20:53 +0100 -Subject: [PATCH] build: fix build with Python 3.12 - -Replace `distutils.version.StrictVersion` with -`packaging.version.Version`. - -Refs: https://github.com/nodejs/node/pull/50209#issuecomment-1795852539 -PR-URL: https://github.com/nodejs/node/pull/50582 -Reviewed-By: Richard Lau <rlau@redhat.com> -Reviewed-By: Chengzhong Wu <legendecas@gmail.com> - -Upstream-Status: Backport [https://github.com/nodejs/node/commit/95534ad82f4e33f53fd50efe633d43f8da70cba6] -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - configure.py | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/configure.py b/configure.py -index 62f041ce..18fe7c14 100755 ---- a/configure.py -+++ b/configure.py -@@ -14,8 +14,6 @@ import bz2 - import io - from pathlib import Path - --from distutils.version import StrictVersion -- - # If not run from node/, cd to node/. - os.chdir(Path(__file__).parent) - -@@ -30,6 +28,7 @@ tools_path = Path('tools') - - sys.path.insert(0, str(tools_path / 'gyp' / 'pylib')) - from gyp.common import GetFlavor -+from packaging.version import Version - - # imports in tools/configure.d - sys.path.insert(0, str(tools_path / 'configure.d')) -@@ -1565,10 +1564,10 @@ def configure_openssl(o): - # supported asm compiler for AVX2. See https://github.com/openssl/openssl/ - # blob/OpenSSL_1_1_0-stable/crypto/modes/asm/aesni-gcm-x86_64.pl#L52-L69 - openssl110_asm_supported = \ -- ('gas_version' in variables and StrictVersion(variables['gas_version']) >= StrictVersion('2.23')) or \ -- ('xcode_version' in variables and StrictVersion(variables['xcode_version']) >= StrictVersion('5.0')) or \ -- ('llvm_version' in variables and StrictVersion(variables['llvm_version']) >= StrictVersion('3.3')) or \ -- ('nasm_version' in variables and StrictVersion(variables['nasm_version']) >= StrictVersion('2.10')) -+ ('gas_version' in variables and Version(variables['gas_version']) >= Version('2.23')) or \ -+ ('xcode_version' in variables and Version(variables['xcode_version']) >= Version('5.0')) or \ -+ ('llvm_version' in variables and Version(variables['llvm_version']) >= Version('3.3')) or \ -+ ('nasm_version' in variables and Version(variables['nasm_version']) >= Version('2.10')) - - if is_x86 and not openssl110_asm_supported: - error('''Did not find a new enough assembler, install one or build with diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch deleted file mode 100644 index 9d878dfb8d..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/0001-gyp-resolve-python-3.12-issues.patch +++ /dev/null @@ -1,63 +0,0 @@ -From bf8c96ba6936050ed4a0de5bc8aeeaf2b3c50dc1 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex@linutronix.de> -Date: Thu, 7 Dec 2023 12:54:30 +0100 -Subject: [PATCH] gyp: resolve python 3.12 issues - -Upstream has updated gyp wholesale in the main branch, so -this patch can be dropped in due time. - -Upstream-Status: Inappropriate [issue will be fixed upstream with the next nodejs LTS update] - -Signed-off-by: Alexander Kanavin <alex@linutronix.de> ---- - deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py | 4 ++-- - tools/gyp/pylib/gyp/input.py | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -index d9699a0a..173e9465 100644 ---- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -+++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/input.py -@@ -16,7 +16,7 @@ import subprocess - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version - from gyp.common import GypError - from gyp.common import OrderedSet - -@@ -1183,7 +1183,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil - else: - ast_code = compile(cond_expr_expanded, "<string>", "eval") - cached_conditions_asts[cond_expr_expanded] = ast_code -- env = {"__builtins__": {}, "v": StrictVersion} -+ env = {"__builtins__": {}, "v": Version} - if eval(ast_code, env, variables): - return true_dict - return false_dict -diff --git a/tools/gyp/pylib/gyp/input.py b/tools/gyp/pylib/gyp/input.py -index 354958bf..ab6112e5 100644 ---- a/tools/gyp/pylib/gyp/input.py -+++ b/tools/gyp/pylib/gyp/input.py -@@ -16,7 +16,7 @@ import subprocess - import sys - import threading - import traceback --from distutils.version import StrictVersion -+from packaging.version import Version - from gyp.common import GypError - from gyp.common import OrderedSet - -@@ -1190,7 +1190,7 @@ def EvalSingleCondition(cond_expr, true_dict, false_dict, phase, variables, buil - else: - ast_code = compile(cond_expr_expanded, "<string>", "eval") - cached_conditions_asts[cond_expr_expanded] = ast_code -- env = {"__builtins__": {}, "v": StrictVersion} -+ env = {"__builtins__": {}, "v": Version} - if eval(ast_code, env, variables): - return true_dict - return false_dict --- -2.39.2 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch new file mode 100644 index 0000000000..689512cb64 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/182d9c05e78.patch @@ -0,0 +1,182 @@ +From 182d9c05e78b1ddb1cb8242cd3628a7855a0336f Mon Sep 17 00:00:00 2001 +From: Andrey Kosyakov <caseq@chromium.org> +Date: Thu, 17 Aug 2023 13:50:11 -0700 +Subject: [PATCH] Define UChar as char16_t + +We used to have UChar defined as uint16_t which does not go along +with STL these days if you try to have an std::basic_string<> of it, +as there are no standard std::char_traits<> specialization for uint16_t. + +This switches UChar to char16_t where practical, introducing a few +compatibility shims to keep CL size small, as (1) this would likely +have to be back-ported and (2) crdtp extensively uses uint16_t for +wide chars. + +Bug: b:296390693 +Change-Id: I66a32d8f0050915225b187de56896c26dd76163d +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4789966 +Reviewed-by: Jaroslav Sevcik <jarin@chromium.org> +Commit-Queue: Jaroslav Sevcik <jarin@chromium.org> +Auto-Submit: Andrey Kosyakov <caseq@chromium.org> +Cr-Commit-Position: refs/heads/main@{#89559} + +Upstream-Status: Backport [https://chromium-review.googlesource.com/c/v8/v8/+/4789966] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/inspector/string-16.cc | 8 +++++++- + src/inspector/string-16.h | 10 ++++++++-- + src/inspector/v8-string-conversions.cc | 6 +++--- + src/inspector/v8-string-conversions.h | 6 ++++-- + .../inspector_protocol/crdtp/test_platform_v8.cc | 9 ++++++--- + 5 files changed, 28 insertions(+), 11 deletions(-) + +--- a/deps/v8/src/inspector/string-16.cc ++++ b/deps/v8/src/inspector/string-16.cc +@@ -27,7 +27,7 @@ bool isSpaceOrNewLine(UChar c) { + return isASCII(c) && c <= ' ' && (c == ' ' || (c <= 0xD && c >= 0x9)); + } + +-int64_t charactersToInteger(const UChar* characters, size_t length, ++int64_t charactersToInteger(const uint16_t* characters, size_t length, + bool* ok = nullptr) { + std::vector<char> buffer; + buffer.reserve(length + 1); +@@ -50,6 +50,8 @@ int64_t charactersToInteger(const UChar* + + String16::String16(const UChar* characters, size_t size) + : m_impl(characters, size) {} ++String16::String16(const uint16_t* characters, size_t size) ++ : m_impl(reinterpret_cast<const UChar*>(characters), size) {} + + String16::String16(const UChar* characters) : m_impl(characters) {} + +@@ -241,6 +243,10 @@ String16 String16::fromUTF16LE(const UCh + #endif // V8_TARGET_BIG_ENDIAN + } + ++String16 String16::fromUTF16LE(const uint16_t* stringStart, size_t length) { ++ return fromUTF16LE(reinterpret_cast<const UChar*>(stringStart), length); ++} ++ + std::string String16::utf8() const { + return UTF16ToUTF8(m_impl.data(), m_impl.size()); + } +--- a/deps/v8/src/inspector/string-16.h ++++ b/deps/v8/src/inspector/string-16.h +@@ -6,6 +6,7 @@ + #define V8_INSPECTOR_STRING_16_H_ + + #include <stdint.h> ++#include <uchar.h> + + #include <cctype> + #include <climits> +@@ -17,7 +18,7 @@ + + namespace v8_inspector { + +-using UChar = uint16_t; ++using UChar = char16_t; + + class String16 { + public: +@@ -27,6 +28,7 @@ class String16 { + String16(const String16&) V8_NOEXCEPT = default; + String16(String16&&) V8_NOEXCEPT = default; + String16(const UChar* characters, size_t size); ++ String16(const uint16_t* characters, size_t size); + V8_EXPORT String16(const UChar* characters); + V8_EXPORT String16(const char* characters); + String16(const char* characters, size_t size); +@@ -48,7 +50,9 @@ class String16 { + int toInteger(bool* ok = nullptr) const; + std::pair<size_t, size_t> getTrimmedOffsetAndLength() const; + String16 stripWhiteSpace() const; +- const UChar* characters16() const { return m_impl.c_str(); } ++ const uint16_t* characters16() const { ++ return reinterpret_cast<const uint16_t*>(m_impl.c_str()); ++ } + size_t length() const { return m_impl.length(); } + bool isEmpty() const { return !m_impl.length(); } + UChar operator[](size_t index) const { return m_impl[index]; } +@@ -78,6 +82,8 @@ class String16 { + // On Big endian architectures, byte order needs to be flipped. + V8_EXPORT static String16 fromUTF16LE(const UChar* stringStart, + size_t length); ++ V8_EXPORT static String16 fromUTF16LE(const uint16_t* stringStart, ++ size_t length); + + std::size_t hash() const { + if (!hash_code) { +--- a/deps/v8/src/inspector/v8-string-conversions.cc ++++ b/deps/v8/src/inspector/v8-string-conversions.cc +@@ -12,7 +12,7 @@ + + namespace v8_inspector { + namespace { +-using UChar = uint16_t; ++using UChar = char16_t; + using UChar32 = uint32_t; + + bool isASCII(UChar c) { return !(c & ~0x7F); } +@@ -386,7 +386,7 @@ std::string UTF16ToUTF8(const UChar* str + + std::basic_string<UChar> UTF8ToUTF16(const char* stringStart, size_t length) { + if (!stringStart || !length) return std::basic_string<UChar>(); +- std::vector<uint16_t> buffer(length); ++ std::vector<UChar> buffer(length); + UChar* bufferStart = buffer.data(); + + UChar* bufferCurrent = bufferStart; +@@ -395,7 +395,7 @@ std::basic_string<UChar> UTF8ToUTF16(con + reinterpret_cast<const char*>(stringStart + length), + &bufferCurrent, bufferCurrent + buffer.size(), nullptr, + true) != conversionOK) +- return std::basic_string<uint16_t>(); ++ return std::basic_string<UChar>(); + size_t utf16Length = bufferCurrent - bufferStart; + return std::basic_string<UChar>(bufferStart, bufferStart + utf16Length); + } +--- a/deps/v8/src/inspector/v8-string-conversions.h ++++ b/deps/v8/src/inspector/v8-string-conversions.h +@@ -5,14 +5,16 @@ + #ifndef V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + #define V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ + ++#include <uchar.h> ++ + #include <cstdint> + #include <string> + + // Conversion routines between UT8 and UTF16, used by string-16.{h,cc}. You may + // want to use string-16.h directly rather than these. + namespace v8_inspector { +-std::basic_string<uint16_t> UTF8ToUTF16(const char* stringStart, size_t length); +-std::string UTF16ToUTF8(const uint16_t* stringStart, size_t length); ++std::basic_string<char16_t> UTF8ToUTF16(const char* stringStart, size_t length); ++std::string UTF16ToUTF8(const char16_t* stringStart, size_t length); + } // namespace v8_inspector + + #endif // V8_INSPECTOR_V8_STRING_CONVERSIONS_H_ +--- a/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc ++++ b/deps/v8/third_party/inspector_protocol/crdtp/test_platform_v8.cc +@@ -11,13 +11,16 @@ + namespace v8_crdtp { + + std::string UTF16ToUTF8(span<uint16_t> in) { +- return v8_inspector::UTF16ToUTF8(in.data(), in.size()); ++ return v8_inspector::UTF16ToUTF8(reinterpret_cast<const char16_t*>(in.data()), ++ in.size()); + } + + std::vector<uint16_t> UTF8ToUTF16(span<uint8_t> in) { +- std::basic_string<uint16_t> utf16 = v8_inspector::UTF8ToUTF16( ++ std::basic_string<char16_t> utf16 = v8_inspector::UTF8ToUTF16( + reinterpret_cast<const char*>(in.data()), in.size()); +- return std::vector<uint16_t>(utf16.begin(), utf16.end()); ++ return std::vector<uint16_t>( ++ reinterpret_cast<const uint16_t*>(utf16.data()), ++ reinterpret_cast<const uint16_t*>(utf16.data()) + utf16.size()); + } + + } // namespace v8_crdtp diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch index cb0237309e..d987ac50be 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs/libatomic.patch @@ -1,21 +1,77 @@ -Link mksnapshot with libatomic on x86 +From 15e751e4b79475fb34e4b32a3ca54119b20c564a Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Sat, 17 Aug 2024 21:33:18 +0800 +Subject: [PATCH] link libatomic for clang conditionally -Clang-12 on x86 emits atomic builtins +Clang emits atomic builtin, explicitly link libatomic conditionally: +- For target build, always link -latomic for clang as usual +- For host build, if host and target have same bit width, cross compiling + is enabled, and host toolchain is gcc which does not link -latomic; + if host and target have different bit width, no cross compiling, + host build is the same with target build that requires to link + -latomic; -Fixes -| module-compiler.cc:(.text._ZN2v88internal4wasm12_GLOBAL__N_123ExecuteCompilationUnitsERKSt10shared_ptrINS2_22BackgroundCompileTokenEEPNS0_8CountersEiNS2_19CompileBaselineOnlyE+0x558): un -defined reference to `__atomic_load' +Fix: +|tmp-glibc/work/core2-64-wrs-linux/nodejs/20.13.0/node-v20.13.0/out/Release/node_js2c: error while loading shared libraries: libatomic.so.1: cannot open shared object file: No such file or directory -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Inappropriate [OE specific] +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + node.gyp | 13 ++++++++++++- + tools/v8_gypfiles/v8.gyp | 15 ++++++++++++--- + 2 files changed, 24 insertions(+), 4 deletions(-) + +diff --git a/node.gyp b/node.gyp +index b425f443..f296f35c 100644 +--- a/node.gyp ++++ b/node.gyp +@@ -487,7 +487,18 @@ + ], + }], + ['OS=="linux" and clang==1', { +- 'libraries': ['-latomic'], ++ 'target_conditions': [ ++ ['_toolset=="host"', { ++ 'conditions': [ ++ ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { ++ 'libraries': ['-latomic'], ++ }], ++ ], ++ }], ++ ['_toolset=="target"', { ++ 'libraries': ['-latomic'], ++ }], ++ ], + }], + ], + }, +diff --git a/tools/v8_gypfiles/v8.gyp b/tools/v8_gypfiles/v8.gyp +index b23263cf..dcabf4ca 100644 --- a/tools/v8_gypfiles/v8.gyp +++ b/tools/v8_gypfiles/v8.gyp -@@ -1436,6 +1436,7 @@ - { - 'target_name': 'mksnapshot', - 'type': 'executable', -+ 'libraries': [ '-latomic' ], - 'dependencies': [ - 'v8_base_without_compiler', - 'v8_compiler_for_mksnapshot', +@@ -1100,9 +1100,18 @@ + # Platforms that don't have Compare-And-Swap (CAS) support need to link atomic library + # to implement atomic memory access + ['v8_current_cpu in ["mips64", "mips64el", "ppc", "arm", "riscv64", "loong64"]', { +- 'link_settings': { +- 'libraries': ['-latomic', ], +- }, ++ 'target_conditions': [ ++ ['_toolset=="host"', { ++ 'conditions': [ ++ ['"<!(echo $HOST_AND_TARGET_SAME_WIDTH)"=="0"', { ++ 'libraries': ['-latomic'], ++ }], ++ ], ++ }], ++ ['_toolset=="target"', { ++ 'libraries': ['-latomic', ], ++ }], ++ ], + }], + ], + }, # v8_base_without_compiler +-- +2.35.5 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.18.0.bb index 25b59495e2..cb11ad2965 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.13.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/nodejs/nodejs_20.18.0.bb @@ -1,15 +1,15 @@ DESCRIPTION = "nodeJS Evented I/O for V8 JavaScript" HOMEPAGE = "http://nodejs.org" LICENSE = "MIT & ISC & BSD-2-Clause & BSD-3-Clause & Artistic-2.0 & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=cef54676c547a5bbab44aa8be3be9ef7" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c83fcdcd43ab352be6429ee1fd8827a0" CVE_PRODUCT = "nodejs node.js" -DEPENDS = "openssl file-replacement-native python3-packaging-native" +DEPENDS = "openssl openssl-native file-replacement-native python3-packaging-native" DEPENDS:append:class-target = " qemu-native" DEPENDS:append:class-native = " c-ares-native" -inherit pkgconfig python3native qemu ptest +inherit pkgconfig python3native qemu ptest siteinfo COMPATIBLE_MACHINE:armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE:armv5 = "(!.*armv5).*" @@ -24,19 +24,17 @@ SRC_URI = "http://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz \ file://0004-v8-don-t-override-ARM-CFLAGS.patch \ file://system-c-ares.patch \ file://0001-liftoff-Correct-function-signatures.patch \ + file://libatomic.patch \ + file://182d9c05e78.patch \ file://run-ptest \ " - SRC_URI:append:class-target = " \ file://0001-Using-native-binaries.patch \ " -SRC_URI:append:toolchain-clang:x86 = " \ - file://libatomic.patch \ - " SRC_URI:append:toolchain-clang:powerpc64le = " \ file://0001-ppc64-Do-not-use-mminimal-toc-with-clang.patch \ " -SRC_URI[sha256sum] = "11d229fcad7e6e10f450301223c602043f021cda51259ffafc7e55e484b37dc7" +SRC_URI[sha256sum] = "7d9433e91fd88d82ba8de86e711ec41907638e227993d22e95126b02f6cd714a" S = "${WORKDIR}/node-v${PV}" @@ -66,28 +64,14 @@ ARCHFLAGS ?= "" PACKAGECONFIG ??= "ares brotli icu zlib" -PACKAGECONFIG[ares] = "--shared-cares,,c-ares" -PACKAGECONFIG[brotli] = "--shared-brotli,,brotli" -PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu" +PACKAGECONFIG[ares] = "--shared-cares,,c-ares c-ares-native" +PACKAGECONFIG[brotli] = "--shared-brotli,,brotli brotli-native" +PACKAGECONFIG[icu] = "--with-intl=system-icu,--without-intl,icu icu-native" PACKAGECONFIG[libuv] = "--shared-libuv,,libuv" PACKAGECONFIG[nghttp2] = "--shared-nghttp2,,nghttp2" PACKAGECONFIG[shared] = "--shared" PACKAGECONFIG[zlib] = "--shared-zlib,,zlib" -# We don't want to cross-compile during target compile, -# and we need to use the right flags during host compile, -# too. -EXTRA_OEMAKE = "\ - CC.host='${CC} -pie -fPIE' \ - CFLAGS.host='${CPPFLAGS} ${CFLAGS}' \ - CXX.host='${CXX} -pie -fPIE' \ - CXXFLAGS.host='${CPPFLAGS} ${CXXFLAGS}' \ - LDFLAGS.host='${LDFLAGS}' \ - AR.host='${AR}' \ - \ - builddir_name=./ \ -" - EXTRANATIVEPATH += "file-native" python prune_sources() { @@ -110,9 +94,11 @@ do_unpack[postfuncs] += "prune_sources" # V8's JIT infrastructure requires binaries such as mksnapshot and # mkpeephole to be run in the host during the build. However, these # binaries must have the same bit-width as the target (e.g. a x86_64 -# host targeting ARMv6 needs to produce a 32-bit binary). Instead of -# depending on a third Yocto toolchain, we just build those binaries -# for the target and run them on the host with QEMU. +# host targeting ARMv6 needs to produce a 32-bit binary). +# 1. If host and target have the different bit width, run those +# binaries for the target and run them on the host with QEMU. +# 2. If host and target have the same bit width, enable upstream +# cross crompile support and no QEMU python do_create_v8_qemu_wrapper () { """Creates a small wrapper that invokes QEMU to run some target V8 binaries on the host.""" @@ -120,6 +106,10 @@ python do_create_v8_qemu_wrapper () { d.expand('${STAGING_DIR_HOST}${base_libdir}')] qemu_cmd = qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), qemu_libdirs) + + if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": + qemu_cmd = "" + wrapper_path = d.expand('${B}/v8-qemu-wrapper.sh') with open(wrapper_path, 'w') as wrapper_file: wrapper_file.write("""#!/bin/sh @@ -138,6 +128,14 @@ addtask create_v8_qemu_wrapper after do_configure before do_compile LDFLAGS:append:x86 = " -latomic" +export CC_host +export CFLAGS_host +export CXX_host +export CXXFLAGS_host +export LDFLAGS_host +export AR_host +export HOST_AND_TARGET_SAME_WIDTH + CROSS_FLAGS = "--cross-compiling" CROSS_FLAGS:class-native = "--no-cross-compiling" @@ -179,4 +177,36 @@ RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \ PACKAGES =+ "${PN}-systemtap" FILES:${PN}-systemtap = "${datadir}/systemtap" +do_configure[prefuncs] += "set_gyp_variables" +do_compile[prefuncs] += "set_gyp_variables" +do_install[prefuncs] += "set_gyp_variables" +python set_gyp_variables () { + if d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "0": + # We don't want to cross-compile during target compile, + # and we need to use the right flags during host compile, + # too. + d.setVar("CC_host", d.getVar("CC") + " -pie -fPIE") + d.setVar("CFLAGS_host", d.getVar("CFLAGS")) + d.setVar("CXX_host", d.getVar("CXX") + " -pie -fPIE") + d.setVar("CXXFLAGS_host", d.getVar("CXXFLAGS")) + d.setVar("LDFLAGS_host", d.getVar("LDFLAGS")) + d.setVar("AR_host", d.getVar("AR")) + elif d.getVar("HOST_AND_TARGET_SAME_WIDTH") == "1": + # Enable upstream cross crompile support + d.setVar("CC_host", d.getVar("BUILD_CC")) + d.setVar("CFLAGS_host", d.getVar("BUILD_CFLAGS")) + d.setVar("CXX_host", d.getVar("BUILD_CXX")) + d.setVar("CXXFLAGS_host", d.getVar("BUILD_CXXFLAGS")) + d.setVar("LDFLAGS_host", d.getVar("BUILD_LDFLAGS")) + d.setVar("AR_host", d.getVar("BUILD_AR")) +} + +python __anonymous () { + # 32 bit target and 64 bit host (x86-64 or aarch64) have different bit width + if d.getVar("SITEINFO_BITS") == "32" and "64" in d.getVar("BUILD_ARCH"): + d.setVar("HOST_AND_TARGET_SAME_WIDTH", "0") + else: + d.setVar("HOST_AND_TARGET_SAME_WIDTH", "1") +} + BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb b/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb index 85c4fa95ae..52af9b99b1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pcimem/pcimem_2.0.bb @@ -10,6 +10,9 @@ COMPATIBLE_HOST = "(x86_64|aarch64|arm|riscv64)" SRCREV = "09724edb1783a98da2b7ae53c5aaa87493aabc9b" SRC_URI = "git://github.com/billfarrow/pcimem.git;branch=master;protocol=https" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch b/meta-openembedded/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch new file mode 100644 index 0000000000..3b7ca951ae --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/common/0001-fix-musl-build.patch @@ -0,0 +1,40 @@ +From 485c21940eb0100a33b7efea40a83e7f79e765f8 Mon Sep 17 00:00:00 2001 +From: Etienne Cordonnier <ecordonnier@snap.com> +Date: Sun, 22 Sep 2024 20:17:52 +0200 +Subject: [PATCH] fix musl build + +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> +--- +Upstream-Status: Pending + + sdk/perfetto.cc | 1 - + src/base/utils.cc | 1 - + 2 files changed, 2 deletions(-) + +diff --git a/sdk/perfetto.cc b/sdk/perfetto.cc +index b10dd5aa92..2eb90f0d15 100644 +--- a/sdk/perfetto.cc ++++ b/sdk/perfetto.cc +@@ -6558,7 +6558,6 @@ std::optional<int32_t> GetTimezoneOffsetMins() { + + #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) +-#include <linux/prctl.h> + #include <sys/prctl.h> + + #ifndef PR_GET_TAGGED_ADDR_CTRL +diff --git a/src/base/utils.cc b/src/base/utils.cc +index 0d9318c136..419c7dbc1a 100644 +--- a/src/base/utils.cc ++++ b/src/base/utils.cc +@@ -40,7 +40,6 @@ + + #if PERFETTO_BUILDFLAG(PERFETTO_OS_LINUX) || \ + PERFETTO_BUILDFLAG(PERFETTO_OS_ANDROID) +-#include <linux/prctl.h> + #include <sys/prctl.h> + + #ifndef PR_GET_TAGGED_ADDR_CTRL +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch b/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch deleted file mode 100644 index d08721ae65..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-Add-missing-header-cstdint-for-uintXX_t-types.patch +++ /dev/null @@ -1,58 +0,0 @@ -From e63949205682bbd2a0e33e256119472d704a2549 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 29 Jan 2023 22:03:01 -0800 -Subject: [PATCH] Add missing header <cstdint> for uintXX_t types - -This is detected by gcc-13 -gcc 13 moved some includes around and as a result <cstdint> is no -longer transitively included [1]. Explicitly include it for uintXX_t. - -[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes - -Upstream-Status: Submitted [https://android-review.googlesource.com/c/platform/external/perfetto/+/2399128] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - include/perfetto/ext/base/http/sha1.h | 1 + - include/perfetto/ext/base/uuid.h | 1 + - src/traced/probes/common/cpu_freq_info.h | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/include/perfetto/ext/base/http/sha1.h b/include/perfetto/ext/base/http/sha1.h -index c583d69d4..7e3a48c83 100644 ---- a/include/perfetto/ext/base/http/sha1.h -+++ b/include/perfetto/ext/base/http/sha1.h -@@ -20,6 +20,7 @@ - #include <stddef.h> - - #include <array> -+#include <cstdint> - #include <string> - - namespace perfetto { -diff --git a/include/perfetto/ext/base/uuid.h b/include/perfetto/ext/base/uuid.h -index 1b4c53815..472042fab 100644 ---- a/include/perfetto/ext/base/uuid.h -+++ b/include/perfetto/ext/base/uuid.h -@@ -18,6 +18,7 @@ - #define INCLUDE_PERFETTO_EXT_BASE_UUID_H_ - - #include <array> -+#include <cstdint> - #include <string> - - #include "perfetto/ext/base/optional.h" -diff --git a/src/traced/probes/common/cpu_freq_info.h b/src/traced/probes/common/cpu_freq_info.h -index 36f7f9c09..8232cbf64 100644 ---- a/src/traced/probes/common/cpu_freq_info.h -+++ b/src/traced/probes/common/cpu_freq_info.h -@@ -17,6 +17,7 @@ - #ifndef SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ - #define SRC_TRACED_PROBES_COMMON_CPU_FREQ_INFO_H_ - -+#include <cstdint> - #include <map> - #include <string> - #include <vector> --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto.bb b/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto.bb index c8f56fd527..8383db3cc0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto.bb @@ -1,5 +1,5 @@ LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390" +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d" require perfetto.inc diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch b/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch index ae644747c1..719663a802 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-meson-add-pc-file-for-lib_perfetto.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/libperfetto/0001-meson-add-pc-file-for-lib_perfetto.patch @@ -3,21 +3,22 @@ From: Markus Volk <f_l_k@t-online.de> Date: Mon, 17 Oct 2022 19:20:53 +0200 Subject: [PATCH] meson: add PC file for lib_perfetto +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- Upstream-Status: Pending - meson.build | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + meson.build | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) +diff --git a/meson.build b/meson.build +index 8fb1e26275..3ef3ebf27d 100644 --- a/meson.build +++ b/meson.build -@@ -19,9 +19,12 @@ +@@ -19,8 +19,11 @@ project( 'perfetto', ['cpp'], -- default_options: ['cpp_std=c++17'] -+ default_options: ['cpp_std=c++17'], -+ version: '31.0' ++ version: '47.0' ) +soversion = meson.project_version() @@ -25,7 +26,7 @@ Upstream-Status: Pending fs = import('fs') if not fs.is_dir('sdk') -@@ -36,8 +39,9 @@ if host_machine.system() == 'android' +@@ -35,8 +38,9 @@ if host_machine.system() == 'android' deps_perfetto += cpp.find_library('log') endif @@ -36,7 +37,7 @@ Upstream-Status: Pending sources: 'sdk/perfetto.cc', dependencies: deps_perfetto, install: true, -@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.cu +@@ -50,6 +54,10 @@ dir_perfetto_trace = join_paths(meson.current_source_dir(), install_data(dir_perfetto_trace / 'perfetto_trace.proto') @@ -47,3 +48,6 @@ Upstream-Status: Pending dep_perfetto = declare_dependency( link_with: lib_perfetto, include_directories: inc_perfetto, +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb index 7e9408b0b2..d2a6fbe654 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.bb @@ -1,16 +1,17 @@ LICENSE = "Apache-2.0 & BSD-3-Clause & MIT & Zlib" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f87516e0b698007e9e75a1fe1012b390 \ +LIC_FILES_CHKSUM = "file://LICENSE;md5=d2572d98547d43906b53615f856a8c2d \ file://buildtools/libcxx/LICENSE.TXT;md5=55d89dd7eec8d3b4204b680e27da3953 \ file://buildtools/libcxxabi/LICENSE.TXT;md5=7b9334635b542c56868400a46b272b1e \ file://buildtools/libunwind/LICENSE.TXT;md5=f66970035d12f196030658b11725e1a1 \ file://buildtools/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ - file://buildtools/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \ + file://buildtools/zlib/LICENSE;md5=8c75f2b4df47a77f9445315a9500cd1c \ file://debian/copyright;md5=4e08364c82141f181de69d0a2b89d612 \ file://python/LICENSE;md5=c602a632c34ade9c78a976734077bce7" +# Dependencies from perfetto/tools/install-build-deps SRC_URI:append = " \ - git://github.com/protocolbuffers/protobuf.git;branch=3.9.x;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \ + git://github.com/protocolbuffers/protobuf.git;branch=main;protocol=https;destsuffix=git/buildtools/protobuf;name=protobuf \ git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git;protocol=https;destsuffix=git/buildtools/libcxx;branch=main;name=libcxx \ git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git;protocol=https;destsuffix=git/buildtools/libcxxabi;branch=main;name=libcxxabi \ git://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git;protocol=https;destsuffix=git/buildtools/libunwind;branch=main;name=libunwind \ @@ -22,25 +23,28 @@ SRC_URI:append = " \ git://android.googlesource.com/platform/bionic.git;branch=master;protocol=https;destsuffix=git/buildtools/bionic;name=bionic \ git://android.googlesource.com/platform/external/zlib.git;branch=master;protocol=https;destsuffix=git/buildtools/zlib;name=zlib \ git://android.googlesource.com/platform/external/lzma.git;branch=master;protocol=https;destsuffix=git/buildtools/lzma;name=lzma \ + git://android.googlesource.com/platform/external/zstd.git;branch=master;protocol=https;destsuffix=git/buildtools/zstd;name=zstd \ https://storage.googleapis.com/perfetto/gn-linux64-1968-0725d782;subdir=git/buildtools/;name=gn \ \ file://0001-Remove-check_build_deps-build-steps.patch \ - file://0001-Add-missing-header-cstdint-for-uintXX_t-types.patch" + file://0002-traced-fix-missing-include.patch \ + " -SRCREV_bionic = "4b0e16bc72a82a63c699977376a7d6eadca1b206" +SRCREV_bionic = "a0d0355105cb9d4a4b5384897448676133d7b8e2" SRCREV_core = "9e6cef7f07d8c11b3ea820938aeb7ff2e9dbaa52" SRCREV_lzma = "7851dce6f4ca17f5caa1c93a4e0a45686b1d56c3" SRCREV_libprocinfo = "fd214c13ededecae97a3b15b5fccc8925a749a84" SRCREV_logging = "7b36b566c9113fc703d68f76e8f40c0c2432481c" -SRCREV_unwinding = "d66882575ebe3700d6a6b10185f3aee28acc1051" -SRCREV_protobuf = "6a59a2ad1f61d9696092f79b6d74368b4d7970a3" +SRCREV_unwinding = "4b59ea8471e89d01300481a92de3230b79b6d7c7" +SRCREV_protobuf = "f0dc78d7e6e331b8c6bb2d5283e06aa26883ca7c" SRCREV_libbase = "78f1c2f83e625bdf66d55b48bdb3a301c20d2fb3" -SRCREV_libcxx = "f8571eaba606bde2eb8cd34b30104ca33e7c207e" -SRCREV_libcxxabi = "8dd405113a4f3694e910b79785dd7fb7535a888a" -SRCREV_libunwind = "aabcd8753678f1536e15eb6385a948470debdae4" -SRCREV_zlib = "5c85a2da4c13eda07f69d81a1579a5afddd35f59" +SRCREV_libcxx = "852bc6746f45add53fec19f3a29280e69e358d44" +SRCREV_libcxxabi = "a37a3aa431f132b02a58656f13984d51098330a2" +SRCREV_libunwind = "419b03c0b8f20d6da9ddcb0d661a94a97cdd7dad" +SRCREV_zlib = "6d3f6aa0f87c9791ca7724c279ef61384f331dfd" +SRCREV_zstd = "77211fcc5e08c781734a386402ada93d0d18d093" -SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib" +SRCREV_FORMAT .="_bionic_core_lzma_libprocinfo_logging_unwinding_protobuf_libbase_libcxx_libcxxabi_libunwind_zlib_zstd" SRC_URI[gn.sha256sum] = "f706aaa0676e3e22f5fc9ca482295d7caee8535d1869f99efa2358177b64f5cd" @@ -96,8 +100,8 @@ do_configure () { ARGS=$ARGS" target_os=\"linux\"" ARGS=$ARGS" target_cpu=\"$arch\"" - ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS}\"" - ARGS=$ARGS" target_cxx=\"$CXX_BIN -std=c++11 ${TUNE_CCARGS}\"" + ARGS=$ARGS" target_cc=\"$CC_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\"" + ARGS=$ARGS" target_cxx=\"$CXX_BIN ${TUNE_CCARGS} ${DEBUG_PREFIX_MAP}\"" ARGS=$ARGS" target_strip=\"$STRIP_BIN\"" # ARGS=$ARGS" target_sysroot=\"${RECIPE_SYSROOT}\"" ARGS=$ARGS" target_linker=\"$CC_BIN ${TUNE_CCARGS} ${LDFLAGS}\"" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc index 4b06c5bf04..e0e4f04a23 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto.inc @@ -1,10 +1,15 @@ SUMMARY = "Perfetto - System profiling, app tracing and trace analysis." HOMEPAGE = "https://github.com/google/perfetto" -SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1" +FILESEXTRAPATHS:prepend := "${THISDIR}/common:" -SRCREV_perfetto = "b8da07095979310818f0efde2ef3c69ea70d62c5" +# Add only patches here which are used by both perfetto and libperfetto +SRC_URI = "git://github.com/google/perfetto.git;protocol=https;name=perfetto;nobranch=1 \ + file://0001-fix-musl-build.patch \ + " + +SRCREV_perfetto = "c74251226a8caa0b43377902ee06d2570faa0c15" SRCREV_FORMAT = "perfetto" -PV = "31.0" +PV = "47.0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch index c10400aef4..118c3aed4a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perfetto/files/0001-Remove-check_build_deps-build-steps.patch +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto/0001-Remove-check_build_deps-build-steps.patch @@ -1,4 +1,4 @@ -From 3b7091243ec03054ca8800b51b85a1c09e7e3075 Mon Sep 17 00:00:00 2001 +From 07ddc4b9b7a6fec73cdc295baba353944857212e Mon Sep 17 00:00:00 2001 From: Sui Chen <suichen6@gmail.com> Date: Mon, 13 Jun 2022 17:46:49 +0000 Subject: [PATCH] Remove "check_build_deps" build steps @@ -11,6 +11,7 @@ Also setting "is_cross_compiling" to true, so that the host-side tools rather than the Bitbake-generated one. Signed-off-by: Sui Chen <suichen6@gmail.com> +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> --- Upstream-Status: Pending @@ -20,10 +21,10 @@ Upstream-Status: Pending 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gn/BUILD.gn b/gn/BUILD.gn -index 8a7ca72a8..e4a2d39f0 100644 +index ed055ee700..ea79979ec5 100644 --- a/gn/BUILD.gn +++ b/gn/BUILD.gn -@@ -111,7 +111,6 @@ group("default_deps") { +@@ -117,7 +117,6 @@ group("default_deps") { deps = [ ":gen_buildflags" ] if (perfetto_build_standalone) { public_deps = [ @@ -32,10 +33,10 @@ index 8a7ca72a8..e4a2d39f0 100644 "//gn/standalone/sanitizers:deps", ] diff --git a/gn/standalone/BUILD.gn b/gn/standalone/BUILD.gn -index 582e9b867..9c77ac64c 100644 +index 36fb6371a5..f7bc97b1a6 100644 --- a/gn/standalone/BUILD.gn +++ b/gn/standalone/BUILD.gn -@@ -441,10 +441,10 @@ config("android_liblog") { +@@ -469,10 +469,10 @@ config("android_liblog") { } # Checks that tools/install-build-deps has been run since it last changed. @@ -53,7 +54,7 @@ index 582e9b867..9c77ac64c 100644 +# args = [ "--android" ] +#} diff --git a/gn/standalone/BUILDCONFIG.gn b/gn/standalone/BUILDCONFIG.gn -index 6f32686c1..c041989b0 100644 +index 05ed548f9d..94db724b2b 100644 --- a/gn/standalone/BUILDCONFIG.gn +++ b/gn/standalone/BUILDCONFIG.gn @@ -59,8 +59,9 @@ declare_args() { @@ -67,7 +68,4 @@ index 6f32686c1..c041989b0 100644 + is_cross_compiling = true } default_configs = [ - "//gn/standalone:debug_symbols", --- -2.37.1 - + "//gn/standalone:default", diff --git a/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch new file mode 100644 index 0000000000..49b7989359 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perfetto/perfetto/0002-traced-fix-missing-include.patch @@ -0,0 +1,28 @@ +From d005c0123b2f929b918359a53ffe61d7ca2212a0 Mon Sep 17 00:00:00 2001 +From: Lalit Maganti <lalitm@google.com> +Date: Wed, 14 Aug 2024 11:56:47 +0100 +Subject: [PATCH] traced: fix missing include + +Change-Id: Ib9ce8ce5b057e89fa451ccef228228d607b36793 +Signed-off-by: Etienne Cordonnier <ecordonnier@snap.com> +--- +Upstream-Status: Backport [https://github.com/google/perfetto/commit/d005c0123b2f929b918359a53ffe61d7ca2212a0] + + src/traced/probes/sys_stats/sys_stats_data_source.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/traced/probes/sys_stats/sys_stats_data_source.h b/src/traced/probes/sys_stats/sys_stats_data_source.h +index e09cd8a2ca..7e4749bdcd 100644 +--- a/src/traced/probes/sys_stats/sys_stats_data_source.h ++++ b/src/traced/probes/sys_stats/sys_stats_data_source.h +@@ -21,6 +21,7 @@ + + #include <map> + #include <memory> ++#include <optional> + #include <string> + + #include "perfetto/ext/base/paged_memory.h" +-- +2.43.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.85.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.89.bb index 66e9a3b719..3d745146f1 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.85.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/exiftool_12.89.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://perl-Image-ExifTool.spec;beginline=5;endline=5;md5=ff inherit cpan -SRCREV = "405674e0c477931b60b10a78828483ef54761385" +SRCREV = "e04534a40925354187e8432d44248229d774f34a" SRC_URI = "git://github.com/exiftool/exiftool;protocol=https;branch=master" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch new file mode 100644 index 0000000000..f29d6c4d8f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch @@ -0,0 +1,28 @@ +From dc970a868a4c2d7e2051b533e0a3588ef1d35530 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Dani=C3=ABl=20van=20Eeden?= <git@myname.nl> +Date: Mon, 26 Aug 2024 10:17:01 +0200 +Subject: [PATCH] Fix building on Fedora 40 with GCC 14.2.1 + +Upstream-Status: Backport [https://github.com/perl5-dbi/dbi/commit/d6e2bf13ac6043f5b0a9a147805b4915bd70e631] + +Signed-off-by: Changqing Li <changqing.li@windriver.com> +--- + DBI.xs | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/DBI.xs b/DBI.xs +index 747e341..9b1d136 100644 +--- a/DBI.xs ++++ b/DBI.xs +@@ -1106,7 +1106,7 @@ dbih_inner(pTHX_ SV *orv, const char *what) + if (!SvMAGICAL(ohv)) { + if (!what) + return NULL; +- if (!hv_fetch(ohv,"_NO_DESTRUCT_WARN",17,0)) ++ if (!hv_fetch((HV*)ohv,"_NO_DESTRUCT_WARN",17,0)) + sv_dump(orv); + croak("%s handle %s is not a DBI handle (has no magic)", + what, neatsvpv(orv,0)); +-- +2.46.0 + diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch deleted file mode 100644 index b41bbe0a50..0000000000 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl/CVE-2014-10402.patch +++ /dev/null @@ -1,56 +0,0 @@ -Backport patch to fix CVE-2014-10402. - -CVE: CVE-2014-10402 -Upstream-Status: Backport [https://github.com/rehsack/dbi/commit/19d0fb1] - -Ref: -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=972180#12 - -Signed-off-by: Kai Kang <kai.kang@windriver.com> - - -From 19d0fb169eed475e1c053e99036b8668625cfa94 Mon Sep 17 00:00:00 2001 -From: Jens Rehsack <sno@netbsd.org> -Date: Tue, 6 Oct 2020 10:22:17 +0200 -Subject: [PATCH] lib/DBD/File.pm: fix CVE-2014-10401 - -Dig into the root cause of RT#99508 - which resulted in CVE-2014-10401 - and -figure out that DBI->parse_dsn is the wrong helper to parse our attributes in -DSN, since in DBD::dr::connect only the "dbname" remains from DSN which causes -parse_dsn to bailout. - -Parsing on our own similar to parse_dsn shows the way out. - -Signed-off-by: Jens Rehsack <sno@netbsd.org> ---- - lib/DBD/File.pm | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/lib/DBD/File.pm b/lib/DBD/File.pm -index fb14e9a..f55076f 100644 ---- a/lib/DBD/File.pm -+++ b/lib/DBD/File.pm -@@ -109,7 +109,11 @@ sub connect - # We do not (yet) care about conflicting attributes here - # my $dbh = DBI->connect ("dbi:CSV:f_dir=test", undef, undef, { f_dir => "text" }); - # will test here that both test and text should exist -- if (my $attr_hash = (DBI->parse_dsn ($dbname))[3]) { -+ # -+ # Parsing on our own similar to parse_dsn to find attributes in 'dbname' parameter. -+ if ($dbname) { -+ my @attrs = split /;/ => $dbname; -+ my $attr_hash = { map { split /\s*=>?\s*|\s*,\s*/, $_} @attrs }; - if (defined $attr_hash->{f_dir} && ! -d $attr_hash->{f_dir}) { - my $msg = "No such directory '$attr_hash->{f_dir}"; - $drh->set_err (2, $msg); -@@ -120,7 +124,6 @@ sub connect - if ($attr and defined $attr->{f_dir} && ! -d $attr->{f_dir}) { - my $msg = "No such directory '$attr->{f_dir}"; - $drh->set_err (2, $msg); -- $attr->{RaiseError} and croak $msg; - return; - } - --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.644.bb index 1fee83a8fd..7f6c9059d0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.643.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libdbi-perl_1.644.bb @@ -7,13 +7,12 @@ database interface independent of the actual database being used. \ HOMEPAGE = "http://search.cpan.org/dist/DBI/" SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=10982c7148e0a012c0fd80534522f5c5" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8097b88c6165f0d43949441e6ea581cd" -SRC_URI = "http://search.cpan.org/CPAN/authors/id/T/TI/TIMB/DBI-${PV}.tar.gz \ - file://CVE-2014-10402.patch \ +SRC_URI = "https://cpan.metacpan.org/authors/id/H/HM/HMBRAND/DBI-${PV}.tar.gz \ + file://0001-Fix-building-on-Fedora-40-with-GCC-14.2.1.patch \ " -SRC_URI[md5sum] = "352f80b1e23769c116082a90905d7398" -SRC_URI[sha256sum] = "8a2b993db560a2c373c174ee976a51027dd780ec766ae17620c20393d2e836fa" +SRC_URI[sha256sum] = "2297b99de09e67086640b590699e0e982fb469da63a93fe28dc14782db7a53c8" S = "${WORKDIR}/DBI-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb b/meta-openembedded/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb index ff4e1f0563..ff1552a99b 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/perl/libpcsc-perl_1.4.15.bb @@ -8,8 +8,10 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENCE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/pcsc-perl-${PV}.tar.bz2" -SRC_URI[md5sum] = "45601505dbb7b27329811ac9bad35fab" -SRC_URI[sha256sum] = "2722b7e5543e4faf3ba1ec6b29a7dfec6d92be1edec09d0a3191992d4d88c69d" +SRC_URI[sha256sum] = "5cc834438739bd6e4e837fb7e10bd8befb809cd185ae6cf4b33e5fa9161f59fe" + +UPSTREAM_CHECK_URI = "https://cpan.metacpan.org/authors/id/W/WH/WHOM/" +UPSTREAM_CHECK_REGEX = "pcsc-perl-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/pcsc-perl-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.18.bb b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.20.bb index e662f6806e..f306b16931 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.18.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/php/php_8.2.20.bb @@ -34,7 +34,7 @@ SRC_URI:append:class-target = " \ " S = "${WORKDIR}/php-${PV}" -SRC_URI[sha256sum] = "ca0b07c254200320f518ac5b3df540a9cf14d866f3c93edc3013b52e06fac796" +SRC_URI[sha256sum] = "5dec6fa61c7b9c47aa1d76666be651f2642ed2bcf6cd8638c57e3571ce2aac61" CVE_STATUS_GROUPS += "CVE_STATUS_PHP" CVE_STATUS_PHP[status] = "fixed-version: The name of this product is exactly the same as github.com/emlog/emlog. CVE can be safely ignored." @@ -43,6 +43,7 @@ CVE_STATUS_PHP = " \ CVE-2007-3205 \ CVE-2007-4596 \ " +CVE_STATUS[CVE-2022-4900] = "cpe-incorrect: The current version (8.2.20) is not affected." inherit autotools pkgconfig python3native gettext multilib_header multilib_script systemd diff --git a/meta-openembedded/meta-oe/recipes-devtools/poke/poke_4.1.bb b/meta-openembedded/meta-oe/recipes-devtools/poke/poke_4.2.bb index 2963680704..eb840435c0 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/poke/poke_4.1.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/poke/poke_4.2.bb @@ -11,7 +11,7 @@ SRC_URI = "${GNU_MIRROR}/poke/poke-${PV}.tar.gz \ DEPENDS = "flex-native bison-native bdwgc readline" -SRC_URI[sha256sum] = "08ecaea41f7374acd4238e12bbf97e8cd5e572d5917e956b73b9d43026e9d740" +SRC_URI[sha256sum] = "8aaf36e61e367a53140ea40e2559e9ec512e779c42bee34e7ac24b34ba119bde" # poke does not support using out-of-tree builds inherit autotools-brokensep gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb index 24de6b8119..82aaf1bae6 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb @@ -36,3 +36,6 @@ RDEPENDS:${PN}-compiler = "protobuf-compiler" RDEPENDS:${PN}-dev += "${PN}-compiler" BBCLASSEXTEND = "native nativesdk" + +# No 64bit atomics +LDFLAGS:append:riscv32 = " -latomic" diff --git a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb index 4f8515471f..d5fd901370 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.3.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/protobuf/protobuf_4.25.5.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b" DEPENDS = "zlib abseil-cpp" DEPENDS:append:class-target = " protobuf-native" -SRCREV = "4a2aef570deb2bfb8927426558701e8bfc26f2a4" +SRCREV = "9d0ec0f92b5b5fdeeda11f9dcecc1872ff378014" SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol=https \ file://run-ptest \ @@ -19,6 +19,8 @@ SRC_URI = "gitsm://github.com/protocolbuffers/protobuf.git;branch=25.x;protocol= SRC_URI:append:mips:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " SRC_URI:append:mipsel:toolchain-clang = " file://0001-Fix-build-on-mips-clang.patch " +UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>.(25\.(\d+)))" + S = "${WORKDIR}/git" inherit cmake pkgconfig ptest @@ -104,6 +106,8 @@ FILES:${PN}-lite = "${libdir}/libprotobuf-lite${SOLIBS}" # CMake requires protoc binary to exist in sysroot, even if it has wrong architecture. SYSROOT_DIRS += "${bindir}" +RDEPENDS:${PN} = "abseil-cpp" +RDEPENDS:${PN}-lite = "abseil-cpp" RDEPENDS:${PN}-compiler = "${PN}" RDEPENDS:${PN}-dev += "${PN}-compiler" RDEPENDS:${PN}-ptest = "bash ${@bb.utils.contains('PACKAGECONFIG', 'python', 'python3-protobuf', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb index 458958edf5..19207883bf 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/pugixml/pugixml_1.14.bb @@ -13,6 +13,7 @@ SRC_URI = "https://github.com/zeux/${BPN}/releases/download/v${PV}/${BP}.tar.gz" SRC_URI[sha256sum] = "2f10e276870c64b1db6809050a75e11a897a8d7456c4be5c6b2e35a11168a015" UPSTREAM_CHECK_URI = "https://github.com/zeux/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb index e30b362323..87e651d9d5 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/python/python3-pefile_2023.2.7.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python3-pefile_2024.8.26.bb @@ -2,10 +2,10 @@ SUMMARY = "Python PE parsing module" DESCRIPTION = "A multi-platform Python module to parse and work with Portable Executable (PE) files." HOMEPAGE = "https://github.com/erocarrera/pefile" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=38066667888b01d8118ff9cc23da1873" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e34c75178086aca0a17551ffbacaca53" inherit setuptools3 ptest -SRCREV = "1ab2807c4eec16041e791d7a6acc68cc23fd5266" +SRCREV = "4b3b1e2e568a88d4f1897d694d684f23d9e270c4" SRC_URI = "git://github.com/erocarrera/pefile;branch=master;protocol=https \ file://run-ptest" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb b/meta-openembedded/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb new file mode 100644 index 0000000000..f92c556005 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/python/python3-psycopg_3.2.2.bb @@ -0,0 +1,14 @@ +SUMMARY = "Psycopg 3 is the implementation of a PostgreSQL adapter for Python." +DESCRIPTION = "Psycopg is the most popular PostgreSQL adapter for the Python \ +programming language. Its core is a complete implementation of the Python DB \ +API 2.0 specifications. Several extensions allow access to many of the \ +features offered by PostgreSQL." + +LICENSE = "LGPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000208d539ec061b899bce1d9ce9404" + +SRC_URI[sha256sum] = "8bad2e497ce22d556dac1464738cb948f8d6bab450d965cf1d8a8effd52412e0" + +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} = "libpq" diff --git a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb index 237c4e7389..7159e74c2a 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/tcltk/tk_8.6.10.bb @@ -26,6 +26,9 @@ SRC_URI = "\ SRC_URI[md5sum] = "602a47ad9ecac7bf655ada729d140a94" SRC_URI[sha256sum] = "63df418a859d0a463347f95ded5cd88a3dd3aaa1ceecaeee362194bc30f3e386" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/tcl/files/Tcl/" +UPSTREAM_CHECK_REGEX = "Tcl/(?P<pver>\d+(\.\d+)+)/" + S = "${WORKDIR}/${BPN}${PV}/unix" DEBUG_PREFIX_MAP += "-fdebug-prefix-map=${S}/../=${TARGET_DBGSRC_DIR}/.." diff --git a/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb index 7e3bddb58d..3b8da91441 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/uw-imap/uw-imap_2007f.bb @@ -53,3 +53,10 @@ ALLOW_EMPTY:${PN} = "1" PARALLEL_MAKE = "" +# http://errors.yoctoproject.org/Errors/Details/766915/ +# unix.c:235:21: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1002:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1163:15: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:1428:40: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +# unix.c:2254:33: error: passing argument 2 of 'utime' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.3.bb index f531218aeb..82201211b9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.2.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/valijson/valijson_1.0.3.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=5c4583a434195e4f3b418e17c8ca2daf" SRC_URI = "git://github.com/tristanpenman/valijson.git;branch=master;protocol=https" -SRCREV = "0b4771e273a065d437814baf426bcfcafec0f434" +SRCREV = "fc9ddf14db683c9443c48ae3a6bf83e0ce3ad37c" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch new file mode 100644 index 0000000000..2ad7beb51c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c/0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch @@ -0,0 +1,58 @@ +From d001f12d428f7adaeaadee5263a22c797c99d67b Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Fri, 30 Aug 2024 11:42:27 +0200 +Subject: [PATCH] aclocal.m4: don't use full path of $with_curl in xerces-c.pc + +* fixes: + ERROR: QA Issue: File /usr/lib32/pkgconfig/xerces-c.pc in package lib32-libxerces-c-dev contains reference to TMPDIR [buildpaths] + +* xerces-c was blacklisted due to tmpdir since 2016: + https://git.openembedded.org/meta-openembedded/commit/?id=1af196e42c811947bb483df30bfce758adee83d1 + +* then sed call: + sed -i -e 's:-L${STAGING_DIR}/lib:-L\$\{libdir\}:g' ${B}/xerces-c.pc + was added to do_install:append and blacklist dropped in: + https://git.openembedded.org/meta-openembedded/commit/?id=87b9efff79e62f569525e4760adc594d0d9ac476 + +* sed call was adjusted in: + https://git.openembedded.org/meta-openembedded/commit/?id=87c9e9537dc43468a6aaf706853b784ce6de14e0 + sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc + +* but it was still failing in some cases, e.g. with multilib where libdir is /usr/lib64, so the sed call is: + sed -i s:-L{WORKDIR}/recipe-sysroot/usr/lib64::g ${WORKDIR}/build/xerces-c.pc + but the actual xerces-c.pc file still has: + + Libs: -L${libdir} -lxerces-c + Libs.private: -L${WORKDIR}/recipe-sysroot/usr/lib -lcurl + + because this aclocal was always hardcoding "lib" (appended to --with-curl + value which is passed together with ${prefix}) and not respecting the libdir value: + PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl" + PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" + +* xerces-c supports CMake since 2017: + https://github.com/apache/xerces-c/commit/2606b2924c3e2bf0cf50f72b79378721b6bcf04e + switching from autotools to CMake would probably resolve some of this as well + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Pending [It would be better to just switch to CMake] + + m4/xerces_curl_prefix.m4 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/m4/xerces_curl_prefix.m4 b/m4/xerces_curl_prefix.m4 +index d1d015c..7928bdc 100644 +--- a/m4/xerces_curl_prefix.m4 ++++ b/m4/xerces_curl_prefix.m4 +@@ -39,8 +39,8 @@ AC_DEFUN([XERCES_CURL_PREFIX], + curl_libs=`$curl_config --libs` + else + if test -n "$with_curl"; then +- curl_flags="-I$with_curl/include" +- curl_libs="-L$with_curl/lib -lcurl" ++ curl_flags="" ++ curl_libs="-lcurl" + else + # Default compiler paths. + # diff --git a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb index 1643af2546..9fd7e8fbab 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xerces-c/xerces-c_3.2.5.bb @@ -9,7 +9,9 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2" +SRC_URI = "http://archive.apache.org/dist/xerces/c/3/sources/${BP}.tar.bz2 \ + file://0001-aclocal.m4-don-t-use-full-path-of-with_curl-in-xerce.patch \ +" SRC_URI[sha256sum] = "1db4028c9b7f1f778efbf4a9462d65e13f9938f2c22f9e9994e12c49ba97e252" inherit autotools @@ -18,10 +20,6 @@ PACKAGECONFIG ??= "curl icu" PACKAGECONFIG[curl] = "--with-curl=${STAGING_DIR_TARGET}${prefix},--with-curl=no,curl" PACKAGECONFIG[icu] = "--with-icu=${STAGING_DIR_TARGET}${prefix},--with-icu=no,icu" -do_install:prepend () { - sed -i s:-L${STAGING_LIBDIR}::g ${B}/xerces-c.pc -} - PACKAGES = "libxerces-c \ libxerces-c-dev \ xerces-c-samples \ diff --git a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb index 5d5152b834..b667507ef9 100644 --- a/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb +++ b/meta-openembedded/meta-oe/recipes-devtools/xmlrpc-c/xmlrpc-c_1.59.01.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/mirror/xmlrpc-c.git;branch=master;protocol=https \ file://0002-fix-formatting-issues.patch \ " #Release 1.59.01 -SRCREV = "352aeaa9ae49e90e55187cbda839f2113df06278" +SRCREV = "08b052692b70171a6fcb437d4f52a46977eda62e" S = "${WORKDIR}/git/stable" diff --git a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb index 178a5eb0b5..4d560eb4b8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb +++ b/meta-openembedded/meta-oe/recipes-extended/bitwise/bitwise_0.50.bb @@ -18,6 +18,7 @@ SRC_URI = "https://github.com/mellowcandle/bitwise/releases/download/v${PV}/bitw SRC_URI[sha256sum] = "806271fa5bf31de0600315e8720004a8f529954480e991ca84a9868dc1cae97e" UPSTREAM_CHECK_URI = "https://github.com/mellowcandle/bitwise/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/${BPN}-v${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb index 4e35283dd2..cfd134dd4f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/boinc/boinc-client_7.20.5.bb @@ -77,6 +77,10 @@ do_install:prepend() { mkdir -p ${D}${sysconfdir}/default } +do_install:append() { + sed -i -e 's#${S}##g' ${D}${includedir}/boinc/svn_version.h +} + SYSTEMD_SERVICE:${PN} = "boinc-client.service" FILES:${PN} += "${libdir}/systemd" diff --git a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb index 68d4042554..acd5b1e800 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cfengine/cfengine-masterfiles_3.21.5.bb @@ -23,7 +23,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=bb843e794feb6890f7697637b461c36e" SRC_URI = "https://cfengine-package-repos.s3.amazonaws.com/tarballs/${BP}.tar.gz \ " #SRC_URI[md5sum] = "5df2f85c75efc351ffadebcc11046a98" -SRC_URI[sha256sum] = "013ebe68599915cedb4bf753b471713d91901a991623358b9a967d9a779bcc16" +SRC_URI[sha256sum] = "0adcfcf36d47317776ad64331058a4d2e3669683314716ddb885f8a13309f47d" + +UPSTREAM_CHECK_URI = "https://github.com/cfengine/masterfiles/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb index cc88602532..4f2585fe76 100644 --- a/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/cmpi-bindings/cmpi-bindings_1.0.4.bb @@ -33,3 +33,7 @@ FILES:${PN} =+"${libdir}/cmpi/libpy3CmpiProvider.so ${PYTHON_SITEPACKAGES_DIR}/* FILES:${PN}-dbg =+ "${libdir}/cmpi/.debug/libpyCmpiProvider.so" BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766910/ +# cmpi-bindings/1.0.4/git/swig/python/../../src/target_python.c:168:21: error: passing argument 1 of 'Py_SetProgramName' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240619.bb index a497175364..0fccce5e86 100644 --- a/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240307.bb +++ b/meta-openembedded/meta-oe/recipes-extended/dialog/dialog_1.3-20240619.bb @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI = "https://invisible-mirror.net/archives/${BPN}/${BP}.tgz" -SRC_URI[sha256sum] = "339d311c6abb240213426b99ad63565cbcb3e8641ef1989c033e945b754d34ef" +SRC_URI[sha256sum] = "5d8c4318963db3fd383525340276e0e05ee3dea9a6686c20779f5433b199547d" # hardcoded here for use in dialog-static recipe S = "${WORKDIR}/dialog-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb index ef016b8683..afa0e4c8fb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/duktape/duktape_2.7.0.bb @@ -11,6 +11,8 @@ inherit ptest SRC_URI[sha256sum] = "90f8d2fa8b5567c6899830ddef2c03f3c27960b11aca222fa17aa7ac613c2890" +UPSTREAM_CHECK_URI = "https://duktape.org/download" + EXTRA_OEMAKE = "INSTALL_PREFIX='${prefix}' DESTDIR='${D}' LIBDIR='/${baselib}'" do_compile () { diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch new file mode 100644 index 0000000000..87000b663d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3/0001-Replacing-GPR_ASSERT-with-c-assert.patch @@ -0,0 +1,33 @@ +From aeb34f58782fb6d06aea4f5cbeccb23a0224466e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 4 Sep 2024 14:54:42 -0700 +Subject: [PATCH] Replacing GPR_ASSERT with c assert + +Latest GRPC >= 2.66 has dropped GRPC_ASSERT macro [1] + +[1] https://github.com/grpc/grpc/commit/0e23c2259da967a037e839e80cafd62bc6f9f68e + +Upstream-Status: Submitted [https://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3/pull/281] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/v3/Action.cpp | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/src/v3/Action.cpp ++++ b/src/v3/Action.cpp +@@ -2,6 +2,15 @@ + #include <grpc/support/log.h> + #include <grpcpp/support/status.h> + #include "etcd/v3/action_constants.hpp" ++#include <cstdlib> ++ ++#ifndef GPR_ASSERT ++#define GPR_ASSERT(x) \ ++ if (!(x)) { \ ++ fprintf(stderr, "%s:%d assert failed\n", __FILE__, __LINE__); \ ++ abort(); \ ++} ++#endif + + etcdv3::Action::Action(etcdv3::ActionParameters const& params) { + parameters = params; diff --git a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb index 88a8ba3469..0e6509d2d1 100644 --- a/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/etcd/etcd-cpp-apiv3_0.15.4.bb @@ -7,6 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=eae7da6a2cd1788a5cf8a9f838cf6450" SRC_URI = " \ git://github.com/etcd-cpp-apiv3/etcd-cpp-apiv3.git;branch=master;protocol=https \ file://0001-include-stdint.h-for-int64_t-types.patch \ + file://0001-Replacing-GPR_ASSERT-with-c-assert.patch \ " SRCREV = "ba6216385fc332b23d95683966824c2b86c2474e" @@ -19,5 +20,9 @@ S = "${WORKDIR}/git" EXTRA_OECONF += "-DCPPREST_EXCLUDE_WEBSOCKETS=ON" +do_install:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${libdir}/cmake/etcd-cpp-api/etcd-targets.cmake +} + SOLIBS = ".so" FILES_SOLIBSDEV = "" diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb index 423c6faf7e..5dfba25140 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak-xdg-utils_1.0.6.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/flatpak/flatpak-xdg-utils.git;protocol=https;branch=main" -SRCREV = "5ba39872f81bf8d98d58c5f8acb86604645be468" +SRCREV = "05abdd7421688be5835a6b12f2b068086c38d4aa" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.10.bb index 8351e7d655..c9d04e9261 100644 --- a/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/flatpak/flatpak_1.15.10.bb @@ -4,22 +4,22 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = " \ - gitsm://github.com/flatpak/flatpak;protocol=https;branch=main \ + git://github.com/flatpak/flatpak;protocol=https;branch=main \ file://0001-flatpak-pc-add-pc_sysrootdir.patch \ " -SRCREV = "925c80f913d69e7ca424428823e1431c4ffb0deb" +SRCREV = "8b4f523c4f8287d57f1a84a3a8216efe200c5fbf" S = "${WORKDIR}/git" -inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native useradd mime features_check +inherit meson pkgconfig gettext systemd gtk-doc gobject-introspection python3native mime features_check REQUIRED_DISTRO_FEATURES = "polkit" DEPENDS = " \ appstream \ bison-native \ - dconf \ + bubblewrap-native \ fuse3 \ gdk-pixbuf \ glib-2.0 \ @@ -31,14 +31,16 @@ DEPENDS = " \ ostree \ polkit \ python3-pyparsing-native \ + xdg-dbus-proxy-native \ zstd \ " RDEPENDS:${PN} = " \ ca-certificates \ - dconf \ flatpak-xdg-utils \ fuse3-utils \ + bubblewrap \ + xdg-dbus-proxy \ " GIR_MESON_OPTION = "gir" @@ -49,6 +51,7 @@ GTKDOC_MESON_ENABLE_FLAG = 'enabled' GTKDOC_MESON_DISABLE_FLAG = 'disabled' PACKAGECONFIG[curl] = "-Dhttp_backend=curl,,curl" +PACKAGECONFIG[dconf] = "-Ddconf=enabled,-Ddconf=disabled,dconf" PACKAGECONFIG[docbook_docs] = "-Ddocbook_docs=enabled,-Ddocbook_docs=disabled,xmlto-native" PACKAGECONFIG[man] = "-Dman=enabled,-Dman=disabled,libxslt-native" PACKAGECONFIG[soup] = "-Dhttp_backend=soup,,libsoup-2.4" @@ -66,15 +69,10 @@ PACKAGECONFIG ?= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland-security-context', '', d)} \ " -EXTRA_OEMESON = "-Dsystem_fusermount=${bindir}/fusermount3" +EXTRA_OEMESON = " \ + -Dsystem_fusermount=fusermount3 \ + -Dsystem_bubblewrap=bwrap \ + -Dsystem_dbus_proxy=xdg-dbus-proxy \ +" FILES:${PN} += "${libdir} ${datadir}" - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd" - -do_install:append() { - chmod 0700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd ${D}/${datadir}/polkit-1/rules.d - chgrp root ${D}/${datadir}/polkit-1/rules.d -} diff --git a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb index ef04111131..660a3a63eb 100644 --- a/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb +++ b/meta-openembedded/meta-oe/recipes-extended/fluentbit/fluentbit_1.9.9.bb @@ -93,3 +93,5 @@ SYSTEMD_SERVICE:${PN} = "td-agent-bit.service" EXTRA_OECMAKE += "-DCMAKE_DEBUG_SRCDIR=${TARGET_DBGSRC_DIR}/" TARGET_CC_ARCH += " ${SELECTED_OPTIMIZATION}" + +SKIP_RECIPE[fluentbit] ?= "It is not reproducible. QA Issue: File /usr/bin/.debug/td-agent-bit in package fluentbit-dbg contains reference to TMPDIR [buildpaths]" diff --git a/meta-openembedded/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch b/meta-openembedded/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch new file mode 100644 index 0000000000..bafe218f0d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/highway/highway/0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch @@ -0,0 +1,76 @@ +From 5d40c0c49f9acde83ba71b6f59094cdbd12e1b78 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 18:22:36 +0000 +Subject: [PATCH] Add cmake check for deducing 32bit or 64bit RISCV + +Currently its only compilable for RV64 when RVV is +enabled, this will extend it to build for RV32 with +RVV as well + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea8b330c..cd824787 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -65,6 +65,34 @@ if (NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE RelWithDebInfo) + endif() + ++include(CheckCSourceCompiles) ++ ++check_c_source_compiles(" ++#if __riscv_xlen == 64 ++int main() { return 0; } ++#else ++#error Not RISCV-64 ++#endif ++" IS_RISCV_XLEN_64) ++ ++check_c_source_compiles(" ++#if __riscv_xlen == 32 ++int main() { return 0; } ++#else ++#error Not RISCV-32 ++#endif ++" IS_RISCV_XLEN_32) ++ ++if(IS_RISCV_XLEN_32) ++ set(RISCV_XLEN 32) ++elseif(IS_RISCV_XLEN_64) ++ set(RISCV_XLEN 64) ++else() ++ message(WARNING "Unable to determine RISC-V XLEN") ++endif() ++ ++message(STATUS "RISC-V XLEN: ${RISCV_XLEN}") ++ + # The following is only required with GCC < 6.1.0 or CLANG < 16.0 + set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4)?") + +@@ -72,7 +100,7 @@ set(HWY_CMAKE_ARM7 OFF CACHE BOOL "Set copts for Armv7 with NEON (requires vfpv4 + # skipped. For GCC 13.1+, you can also build with -fexcess-precision=standard. + set(HWY_CMAKE_SSE2 OFF CACHE BOOL "Set SSE2 as baseline for 32-bit x86?") + +-# Currently this will compile the entire codebase with `-march=rv64gcv1p0`: ++# Currently this will compile the entire codebase with `-march=rv<XLEN>gcv1p0`: + set(HWY_CMAKE_RVV ON CACHE BOOL "Set copts for RISCV with RVV?") + + # Unconditionally adding -Werror risks breaking the build when new warnings +@@ -378,7 +406,11 @@ else() + # we add the gcv compiler flag, which then requires the CPU (now when using + # either compiler) to support V. + if(HWY_CMAKE_RVV) +- list(APPEND HWY_FLAGS -march=rv64gcv1p0) ++ if(RISCV_XLEN EQUAL 64) ++ list(APPEND HWY_FLAGS -march=rv64gcv1p0) ++ elseif(RISCV_XLEN EQUAL 32) ++ list(APPEND HWY_FLAGS -march=rv32gcv1p0) ++ endif() + if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") + list(APPEND HWY_FLAGS -menable-experimental-extensions) + endif() diff --git a/meta-openembedded/meta-oe/recipes-extended/highway/highway_1.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/highway/highway_1.2.0.bb index 5d74941245..d226cd82ce 100644 --- a/meta-openembedded/meta-oe/recipes-extended/highway/highway_1.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/highway/highway_1.2.0.bb @@ -6,12 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9" inherit cmake -SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master" +SRC_URI = "git://github.com/google/highway.git;protocol=https;branch=master \ + file://0001-Add-cmake-check-for-deducing-32bit-or-64bit-RISCV.patch" SRCREV = "457c891775a7397bdb0376bb1031e6e027af1c48" S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DBUILD_TESTING=0 -DCMAKE_BUILD_TYPE=Release" + CXXFLAGS:append:arm = " -mfp16-format=ieee" # Option not supported with clang and its default format for __fp16 anyway with clang CXXFLAGS:remove:toolchain-clang = "-mfp16-format=ieee" + +TOOLCHAIN = "gcc" diff --git a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis/run-ptest b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis/run-ptest index 8d450b881f..8b352c3401 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis/run-ptest +++ b/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis/run-ptest @@ -2,17 +2,17 @@ TEST_SSL=0 TEST_ASYNC=0 ./test.sh | sed -e 's/PASSED/PASS/g' -e 's/FAILED/FAIL/g' -e 's/SKIPPED/SKIP/g' | awk ' { - if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") { + gsub(/\x1B\[[0-9;]*m/, "") + if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") { printf "%s: %s\n", $NF, $0 } else { print } -}'| awk '{ - if ($NF == "\033[0;32mPASS\033[0;0m" || $NF == "\033[0;31mFAIL\033[0;0m" || $NF == "\033[01;33mSKIP\033[0;0m") { +}' | awk '{ + if ($NF == "PASS" || $NF == "FAIL" || $NF == "SKIP") { $NF = "" print $0 } else { - print - } + print + } }' | awk '{gsub(/:/,"",$NF)}1' - diff --git a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb index be420b4837..c54b2e0d88 100644 --- a/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/hplip/hplip_3.22.10.bb @@ -19,6 +19,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Drop-using-register-storage-classifier.patch" SRC_URI[sha256sum] = "533c3f2f6b53e4163ded4fd81d1f11ae6162a0f6451bd5e62a8382d0c1366624" +UPSTREAM_CHECK_URI = "https://sourceforge.net/p/hplip/activity" + DEPENDS += "cups python3 libusb1 python3-setuptools-native" inherit autotools-brokensep python3-dir python3native python3targetconfig pkgconfig systemd @@ -49,7 +51,7 @@ EXTRA_OECONF += "\ --with-cupsfilterdir=${libexecdir}/cups/filter \ " -EXTRA_OEMAKE = "rulessystemdir=${systemd_unitdir}/system/" +EXTRA_OEMAKE = "CPPFLAGS='${CFLAGS}' rulessystemdir=${systemd_unitdir}/system/" do_install:append() { rm -rf ${D}${datadir}/hplip/upgrade.py diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch index c5e210afcd..994f252a15 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm/0001-configure.ac-skip-running-test-program-when-cross-co.patch @@ -1,4 +1,4 @@ -From c2a67c1f62175ab061bc03d10dd766f968c6a097 Mon Sep 17 00:00:00 2001 +From 06207b1340963e77f2e5d08ebf9727180ad86a36 Mon Sep 17 00:00:00 2001 From: Naveen Saini <naveen.kumar.saini@intel.com> Date: Fri, 2 Aug 2019 10:41:26 +0800 Subject: [PATCH] configure.ac: skip running test program when cross-compiling @@ -7,12 +7,14 @@ Upstream-Status: Inappropriate [OE-Specific] Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> --- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) + configure.ac | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) +diff --git a/configure.ac b/configure.ac +index c4a9b02..3f5a792 100644 --- a/configure.ac +++ b/configure.ac -@@ -160,7 +160,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd mem +@@ -151,7 +151,7 @@ AC_CHECK_FUNCS([backtrace_symbols_fd memrchr sysctl sysctlbyname]) AC_FUNC_SELECT_ARGTYPES AC_MSG_CHECKING([for strlcpy]) @@ -21,7 +23,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> char a[2]; if (strlcpy(a, "yes", 2) != 3) return 1;]])], -@@ -176,7 +176,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ +@@ -167,7 +167,7 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ ]) AC_MSG_CHECKING([for strlcat]) @@ -30,7 +32,7 @@ Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> char a[4] = "no"; if (strlcat(a, "yes", 4) != 5) return 1;]])], -@@ -191,21 +191,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#includ +@@ -182,21 +182,6 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[#include <string.h>]],[[ [Define to 1 if you have the strlcat function.]) ]) diff --git a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb index 6e50231c83..c6202905d0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_3.4.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/icewm/icewm_3.6.0.bb @@ -5,9 +5,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4a26952467ef79a7efca4a9cf52d417b" SRC_URI = "https://github.com/ice-wm/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.lz \ file://0001-configure.ac-skip-running-test-program-when-cross-co.patch \ " -SRC_URI[sha256sum] = "8d1afe9a2d5e28e88261b68906337449307e53f06c08218e1a6409083998a5f1" +SRC_URI[sha256sum] = "979fafd3a3371f73cbafe592e2be052475637ac4bb4385bb132331fd6924bc76" UPSTREAM_CHECK_URI = "https://github.com/ice-wm/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig gettext perlnative features_check qemu update-alternatives REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb index fb1aefad61..9bb2e2f1f3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb +++ b/meta-openembedded/meta-oe/recipes-extended/inputattach-config/inputattach-config.bb @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/GPL-2.0-only;md5=801f80980d171d SRC_URI = "file://inputattach.conf" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb index 5f2993dd4f..87fcf8cc61 100644 --- a/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/isomd5sum/isomd5sum_1.2.5.bb @@ -31,6 +31,6 @@ RPROVIDES:${BPN}-dbg += "python3-${BPN}-dbg" FILES:python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/pyisomd5sum.so" -SRCREV = "3f4c9bd3f21ec9ac75a025dfa3fa30fe3f621831" +SRCREV = "ed1f54de86b5d507c4cfa552923e9ddfddd9b893" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch new file mode 100644 index 0000000000..5298cfbefc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson/0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch @@ -0,0 +1,51 @@ +From 521d37abc0ed1178a39298d06d80d8d0e2a43e28 Mon Sep 17 00:00:00 2001 +From: Chen Qi <Qi.Chen@windriver.com> +Date: Tue, 10 Sep 2024 00:48:00 -0700 +Subject: [PATCH] add back JSON_INTEGER_IS_LONG_LONG for cmake + +For autotools, JSON_INTEGER_IS_LONG_LONG is defined, but for +cmake, it's not. This means such macro, which is also documented, +is not consistent across different build systems. This is not +good, so add it for cmake. + +This patch refers 8b975abca1055d40637c90b1dc4585af1d7df76c and is +part of it. So the upstream-status is marked as 'oe specific'. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi <Qi.Chen@windriver.com> +--- + CMakeLists.txt | 1 + + cmake/jansson_config.h.cmake | 4 +--- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 39b9ad3..0e95a94 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -193,6 +193,7 @@ endif () + # detect what to use for the 64 bit type. + # Note: I will prefer long long if I can get it, as that is what the automake system aimed for. + if (NOT DEFINED JSON_INT_T) ++ set (JSON_INTEGER_IS_LONG_LONG 1) + if (HAVE_LONG_LONG_INT AND (LONG_LONG_INT EQUAL 8)) + set (JSON_INT_T "long long") + elseif (HAVE_INT64_T) +diff --git a/cmake/jansson_config.h.cmake b/cmake/jansson_config.h.cmake +index 2f248cb..bec64da 100644 +--- a/cmake/jansson_config.h.cmake ++++ b/cmake/jansson_config.h.cmake +@@ -21,9 +21,7 @@ + #define JANSSON_USING_CMAKE + #endif + +-/* Note: when using cmake, JSON_INTEGER_IS_LONG_LONG is not defined nor used, +- * as we will also check for __int64 etc types. +- * (the definition was used in the automake system) */ ++#cmakedefine JSON_INTEGER_IS_LONG_LONG 1 + + /* Bring in the cmake-detected defines */ + #cmakedefine HAVE_STDINT_H 1 +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb index 833060686a..9f5cdcf4c0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb +++ b/meta-openembedded/meta-oe/recipes-extended/jansson/jansson_2.14.bb @@ -7,11 +7,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=afd92c4cfc08f4896003251b878cc0bf" SRC_URI = "https://github.com/akheron/${BPN}/releases/download/v${PV}/${BP}.tar.bz2 \ file://0001-Fix-overwriting-linker-flags.patch \ file://0001-Honour-multilib-paths.patch \ + file://0001-add-back-JSON_INTEGER_IS_LONG_LONG-for-cmake.patch \ " SRC_URI[sha256sum] = "fba956f27c6ae56ce6dfd52fbf9d20254aad42821f74fa52f83957625294afb9" UPSTREAM_CHECK_URI = "https://github.com/akheron/${BPN}/releases" -UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)\.tar" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb b/meta-openembedded/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb deleted file mode 100644 index 43deac3839..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/lastlog2/lastlog2_1.2.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Y2038 safe version of lastlog" -HOMEPAGE = "https://github.com/thkukuk/lastlog2" -DESCRIPTION = "lastlog reports the last login of a given user or of all users who did ever login on a system." -LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=020090a00b69dd2af9ab82eb0003ea2c" -SECTION = "libs" - -SRCREV = "6138dff6f2a5216065fa4833a223b56d98cb62f3" - -SRC_URI = "git://github.com/thkukuk/lastlog2.git;branch=main;protocol=https \ - file://0001-remove-lto-to-fix-link-error-of-clang.patch \ -" - -S = "${WORKDIR}/git" - -inherit meson pkgconfig systemd features_check - -DEPENDS += " ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)} sqlite3 " -REQUIRED_DISTRO_FEATURES = "pam" - -SYSTEMD_SERVICE:${PN} = "lastlog2-import.service" - -EXTRA_OEMESON = " -Dpamlibdir=${libdir}" - -do_install:append () { - if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then - # Fix makefile hardcoded path assumptions for systemd (assumes $prefix) - # without usrmerge distro feature enabled - install -d `dirname ${D}${systemd_unitdir}` - mv ${D}${prefix}/lib/systemd `dirname ${D}${systemd_unitdir}` - fi -} - -FILES:${PN} += " ${systemd_system_unitdir} " -FILES:${PN} += " ${libdir} " -FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* " diff --git a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb index d540737bc9..0c2382fe85 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libbacktrace/libbacktrace_git.bb @@ -13,6 +13,9 @@ SRC_URI = "git://github.com/ianlancetaylor/libbacktrace;protocol=https;branch=ma PV = "1.0+git" SRCREV = "9ae4f4ae4481b1e69d38ed810980d33103544613" +# The current PV is not a git tag but a README content +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch new file mode 100644 index 0000000000..8129c1e2a7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/files/0001-libext2fs-unused-parameters-fix.patch @@ -0,0 +1,92 @@ +From 3aad8d471201da4125bd03d7a6921707461fe182 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Fri, 7 Jun 2024 10:06:22 +0200 +Subject: [PATCH 1/3] fs: Ignore unused-parameter warning in the FS plugin + +There are some unused parameters in the libext2fs header which +together with Wall and Werror means the plugin compilation fails. +As a workaround we'll disable the unused-parameter warning for +now. + +Fixes: #1026 + +Taken from Fedora + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 7d4849c0..00474d5a 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From da5c14f3e2f83c8c40203897154ee2b788782792 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Fri, 7 Jun 2024 15:21:09 +0200 +Subject: [PATCH 2/3] fs: Ignore shift-count-overflow warning in FS plugin + +The warning happens in the libext2fs header. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 00474d5a..42e1c777 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + + +From 90ceb4b52fbda34673fe5303da84b9a902187503 Mon Sep 17 00:00:00 2001 +From: Vojtech Trefny <vtrefny@redhat.com> +Date: Wed, 12 Jun 2024 15:34:02 +0200 +Subject: [PATCH 3/3] fs: Fix ignoring errors from libext2fs + +Follow-up for #1028, we still want to show the warning and not +completely supress it. +--- + src/plugins/fs/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/plugins/fs/Makefile.am b/src/plugins/fs/Makefile.am +index 42e1c777..1ee256f0 100644 +--- a/src/plugins/fs/Makefile.am ++++ b/src/plugins/fs/Makefile.am +@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects + + lib_LTLIBRARIES = libbd_fs.la + +-libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-unused-parameter -Wno-shift-count-overflow ++libbd_fs_la_CFLAGS = $(GLIB_CFLAGS) $(GIO_CFLAGS) $(BLKID_CFLAGS) $(MOUNT_CFLAGS) $(UUID_CFLAGS) $(EXT2FS_CFLAGS) -Wall -Wextra -Werror -Wno-error=unused-parameter -Wno-error=shift-count-overflow + libbd_fs_la_LIBADD = ${builddir}/../../utils/libbd_utils.la $(GLIB_LIBS) $(GIO_LIBS) $(BLKID_LIBS) $(MOUNT_LIBS) $(UUID_LIBS) $(EXT2FS_LIBS) + libbd_fs_la_LDFLAGS = -L${srcdir}/../../utils/ -version-info 3:0:0 -Wl,--no-undefined -export-symbols-regex '^bd_.*' + libbd_fs_la_CPPFLAGS = -I${builddir}/../../../include/ -I${srcdir}/../ +-- +2.45.2 + diff --git a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb index fb778005ff..a42e09d336 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libblockdev/libblockdev_3.1.1.bb @@ -14,6 +14,7 @@ DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + file://0001-libext2fs-unused-parameters-fix.patch \ " SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb index 7498a57049..85d3853f4c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libstatgrab/libstatgrab_0.92.1.bb @@ -14,6 +14,7 @@ SRC_URI = "https://github.com/libstatgrab/libstatgrab/releases/download/LIBSTATG SRC_URI[sha256sum] = "5688aa4a685547d7174a8a373ea9d8ee927e766e3cc302bdee34523c2c5d6c11" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\_\d+)+)" # Perl5 is for tests only EXTRA_OECONF = "--without-perl5 --with-mnttab=/proc/mounts" diff --git a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb index 93b58057ce..58bfd1f25b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libwmf/libwmf_0.2.8.4.bb @@ -24,6 +24,13 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/${BPN}/${PV}/${BPN}-${PV}.tar.gz;name=ta SRC_URI[tarball.md5sum] = "d1177739bf1ceb07f57421f0cee191e0" SRC_URI[tarball.sha256sum] = "5b345c69220545d003ad52bfd035d5d6f4f075e65204114a9e875e84895a7cf8" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wvware/files/libwmf/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + +do_install:append() { + sed -i -e 's@${RECIPE_SYSROOT}@@g' ${D}${bindir}/libwmf-config +} + FILES:${PN}-dbg += "${libdir}/gtk-2.0/2.10.0/loaders/.debug" FILES:${PN}-dev += "${libdir}/gtk-2.0/2.10.0/loaders/*.la" FILES:${PN}-staticdev += "${libdir}/gtk-2.0/2.10.0/loaders/*.a" diff --git a/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb index f11c52dd11..ae2714d7e7 100644 --- a/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/libx86-1/libx86-1_1.1.bb @@ -16,6 +16,8 @@ SRC_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/l " SRC_URI[sha256sum] = "5bf13104cb327472b5cb65643352a9138646becacc06763088d83001d832d048" +UPSTREAM_CHECK_URI = "https://mirrors.slackware.com/slackware/slackware-current/source/ap/libx86/" + BPN = "libx86" COMPATIBLE_HOST = '(x86_64|i.86).*-linux' diff --git a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb index 2efaa2b3c6..89012f8852 100644 --- a/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.10.bb +++ b/meta-openembedded/meta-oe/recipes-extended/logwatch/logwatch_7.11.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ba882fa9b4b6b217a51780be3f4db9c8" RDEPENDS:${PN} = "perl" SRC_URI = "http://jaist.dl.sourceforge.net/project/${BPN}/${BP}/${BP}.tar.gz" -SRC_URI[sha256sum] = "329df0991b879764ed7e50a869de5b6bfa70d241eb254397a5659d1ff5f2588f" +SRC_URI[sha256sum] = "5eb42d983a9667003368b572149fce788c0d7e13daaf1f28ad1bf3a140b865cf" do_install() { install -m 0755 -d ${D}${sysconfdir}/logwatch/scripts diff --git a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb index 73e4eac3dd..c1a8aadff8 100644 --- a/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb +++ b/meta-openembedded/meta-oe/recipes-extended/lprng/lprng_3.8.C.bb @@ -9,9 +9,14 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ SRC_URI[md5sum] = "5901bed95e61d2bea3ba3056056af432" SRC_URI[sha256sum] = "694a1747a96385b89e93f43343bf35cee5c8c73353a83814106911c99f09de10" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/lprng/files/lprng/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)\.tar" + inherit autotools gettext -EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost" +EXTRA_OECONF = "--disable-ssl --disable-kerberos --enable-force_localhost \ + CHOWN=${base_bindir}/chown CHGRP=${base_bindir}/chgrp \ + OPENSSL=${bindir}/openssl PRUTIL=${bindir}/pr" FILES:${PN}-dbg += "${libdir}/lprng/filters/.debug" # configure: WARNING: Program 'clear' is not found. Set environment CLEAR=no if you do not want to use it diff --git a/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest b/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest new file mode 100644 index 0000000000..865da9f69e --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum/run-ptest @@ -0,0 +1,27 @@ +#!/bin/sh + +# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH +# +# SPDX-License-Identifier: MIT + +fail_count=0 +all_count=0 + +for test_suite in tests/test_* +do + if "./$test_suite" + then + echo "PASS: $test_suite" + else + echo "FAIL: $test_suite" + fail_count=$((fail_count + 1)) + fi + all_count=$((all_count + 1)) +done + +if [ $fail_count -eq 0 ] +then + echo "PASS: All $all_count tests passed" +else + echo "FAIL: $fail_count of $all_count tests failed" +fi diff --git a/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.6.bb b/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.6.bb new file mode 100644 index 0000000000..01a134a5bc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/magic-enum/magic-enum_0.9.6.bb @@ -0,0 +1,44 @@ +# SPDX-FileCopyrightText: 2024 Bosch Sicherheitssysteme GmbH +# +# SPDX-License-Identifier: MIT + +SUMMARY = "Static reflection for enums" +DESCRIPTION = "Header-only C++17 library provides static reflection for enums, works \ +with any enum type without any macro or boilerplate code." +BUGTRACKER = "https://github.com/Neargye/magic_enum/issues" +HOMEPAGE = "https://github.com/Neargye/magic_enum" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7e7717cf723eb72f57e80fdb651cb318" + +SRC_URI = " \ + git://github.com/Neargye/magic_enum.git;protocol=https;branch=master \ + file://run-ptest \ +" + +SRCREV = "dd6a39d0ba1852cf06907e0f0573a2a10d23c2ad" +S = "${WORKDIR}/git" + +inherit cmake ptest + +EXTRA_OECMAKE = "\ + -DMAGIC_ENUM_OPT_BUILD_EXAMPLES=OFF \ +" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/tests + install -m 0755 ${B}/test/test_* ${D}${PTEST_PATH}/tests +} + +# Add catkin and colcon (ROS build system) support +FILES:${PN}-dev += "\ + ${datadir}/magic_enum/package.xml \ +" + +# Header-only library +# ${PN} is empty so we need to tweak -dev and -dbg package dependencies +RDEPENDS:${PN}-dev = "" +RDEPENDS:${PN}-ptest = "" +RRECOMMENDS:${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch new file mode 100644 index 0000000000..c19a32690d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1849070.patch @@ -0,0 +1,36 @@ +Bug 1849070 - Avoid using char_traits<unsigned char>. r=spidermonkey-reviewers,anba + +It is not guaranteed to exist by the standard, and is actively being +removed from libc++ in LLVM 18. + +Differential Revision: https://phabricator.services.mozilla.com/D186421 + +Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/68ff4d3f7338248b4d67cf03aade5a73f8d396b2] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/js/src/builtin/intl/Locale.cpp ++++ b/js/src/builtin/intl/Locale.cpp +@@ -802,8 +802,10 @@ static inline auto FindUnicodeExtensionT + UnicodeKey key) { + JS::AutoCheckCannotGC nogc; + return unicodeExtension->hasLatin1Chars() +- ? FindUnicodeExtensionType(unicodeExtension->latin1Chars(nogc), +- unicodeExtension->length(), key) ++ ? FindUnicodeExtensionType( ++ reinterpret_cast<const char*>( ++ unicodeExtension->latin1Chars(nogc)), ++ unicodeExtension->length(), key) + : FindUnicodeExtensionType(unicodeExtension->twoByteChars(nogc), + unicodeExtension->length(), key); + } +@@ -920,7 +922,9 @@ static BaseNamePartsResult BaseNameParts + static inline auto BaseNameParts(JSLinearString* baseName) { + JS::AutoCheckCannotGC nogc; + return baseName->hasLatin1Chars() +- ? BaseNameParts(baseName->latin1Chars(nogc), baseName->length()) ++ ? BaseNameParts( ++ reinterpret_cast<const char*>(baseName->latin1Chars(nogc)), ++ baseName->length()) + : BaseNameParts(baseName->twoByteChars(nogc), baseName->length()); + } + diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch new file mode 100644 index 0000000000..93e0f0f4f9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115/1894423.patch @@ -0,0 +1,30 @@ +Bug 1894423 - Remove unused ExclusiveData move constructor. r=spidermonkey-reviewers,jonco + +Because the constructor is actually not used, the compiler used to not +complain about it being broken. Recent changes on clang trunk made it +catch this problem without the constructor being used. + +As Mutex doesn't have a move constructor, it's also not only a matter of +adding the missing underscore to lock. + +As the constructor is never used, just remove it. + +Differential Revision: https://phabricator.services.mozilla.com/D209108 + +Upstream-Status: Backport [https://hg.mozilla.org/mozilla-central/rev/223087fdc29f] +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- a/js/src/threading/ExclusiveData.h ++++ b/js/src/threading/ExclusiveData.h +@@ -109,11 +109,6 @@ class ExclusiveData { + explicit ExclusiveData(const MutexId& id, Args&&... args) + : lock_(id), value_(std::forward<Args>(args)...) {} + +- ExclusiveData(ExclusiveData&& rhs) +- : lock_(std::move(rhs.lock)), value_(std::move(rhs.value_)) { +- MOZ_ASSERT(&rhs != this, "self-move disallowed!"); +- } +- + ExclusiveData& operator=(ExclusiveData&& rhs) { + this->~ExclusiveData(); + new (mozilla::KnownNotNull, this) ExclusiveData(std::move(rhs)); diff --git a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb index b088286023..f25c5a8f95 100644 --- a/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/mozjs/mozjs-115_115.11.0.bb @@ -16,9 +16,14 @@ SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/fire file://musl-disable-stackwalk.patch \ file://0001-add-arm-to-list-of-mozinline.patch \ file://armv5.patch \ + file://1849070.patch \ + file://1894423.patch \ " SRC_URI[sha256sum] = "16be46f16a356a2b8bd3541805a24c8a2acf6f077cf8a65859689685c26025e0" +UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/mozjs115" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/firefox-${PV}" inherit pkgconfig perlnative python3native rust @@ -62,6 +67,8 @@ ICU ?= "--with-system-icu" ICU:mipsarch = "" ICU:powerpc:toolchain-clang = "" +LDFLAGS:append:riscv32 = " -latomic" + do_configure() { cd ${B} python3 ${S}/configure.py \ diff --git a/meta-openembedded/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch b/meta-openembedded/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch new file mode 100644 index 0000000000..090ed5c1c9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/newt/files/0001-detect-gold-as-GNU-linker-too.patch @@ -0,0 +1,29 @@ +From 08ba909500412611953aea0fa2fe0d8fe76b6e24 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> +Date: Wed, 21 Sep 2016 21:14:40 +0200 +Subject: [PATCH] detect gold as GNU linker too +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Upstream-Status: Pending + +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 468c718..cd93f30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -28,7 +28,7 @@ AC_CHECK_SIZEOF([void *]) + AC_MSG_CHECKING([for GNU ld]) + LD=$($CC -print-prog-name=ld 2>&5) + +-if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ld") = 0; then ++if test $($LD -v 2>&1 | $ac_cv_path_GREP -c "GNU ") = 0; then + # Not + GNU_LD="" + AC_MSG_RESULT([no]) diff --git a/meta-openembedded/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch b/meta-openembedded/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch new file mode 100644 index 0000000000..bc55582fd9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/newt/files/Makefile.in-Add-tinfo-library-to-the-linking-librari.patch @@ -0,0 +1,26 @@ +From fad40cfc18a42946a9a9e440c3434cd6b847ff9d Mon Sep 17 00:00:00 2001 +From: Otavio Salvador <otavio@ossystems.com.br> +Date: Mon, 18 Jan 2016 17:05:19 +0000 +Subject: [PATCH] Makefile.in: Add tinfo library to the linking libraries +Organization: O.S. Systems Software LTDA. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + Makefile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.in b/Makefile.in +index a85d00f..98b85f9 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -1,4 +1,4 @@ +-LIBS = -lslang @LIBS@ ++LIBS = -lslang -ltinfo @LIBS@ + LIBTCL = @TCL_LIB_FLAG@ + + CC = @CC@ +-- +2.1.4 + diff --git a/meta-openembedded/meta-oe/recipes-extended/newt/files/cross_ar.patch b/meta-openembedded/meta-oe/recipes-extended/newt/files/cross_ar.patch new file mode 100644 index 0000000000..86cc0be1d3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/newt/files/cross_ar.patch @@ -0,0 +1,56 @@ +Fix cross link using autoconf detected AR + +If building on 32bit host and creating 64bit libraries, the target +package builds should not invoke the 32bit hosts's ar. Specifically +you will get an error message like: + +x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -g -o test test.o libnewt.a -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -lslang +libnewt.a: could not read symbols: Archive has no index; run ranlib to add one +collect2: error: ld returned 1 exit status + +Signed-off-by: Jason Wessel <jason.wessel@windriver.com> + +Upstream-Status: Pending + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + Makefile.in | 3 ++- + configure.ac | 4 ++++ + 2 files changed, 6 insertions(+), 1 deletion(-) + +Index: newt-0.52.20/Makefile.in +=================================================================== +--- newt-0.52.20.orig/Makefile.in ++++ newt-0.52.20/Makefile.in +@@ -7,6 +7,7 @@ CFLAGS = @CFLAGS@ + LDFLAGS = @LDFLAGS@ + CPPFLAGS = -D_GNU_SOURCE @CPPFLAGS@ + GNU_LD = @GNU_LD@ ++AR = @AR@ + + VERSION = @VERSION@ + TAG = r$(subst .,-,$(VERSION)) +@@ -109,7 +110,7 @@ whiptcl.$(SOEXT): $(WHIPTCLOBJS) $(LIBNE + $(CC) -shared $(SHCFLAGS) $(LDFLAGS) -o whiptcl.$(SOEXT) $(WHIPTCLOBJS) -L. -lnewt $(LIBTCL) -lpopt $(LIBS) + + $(LIBNEWT): $(LIBOBJS) +- ar rv $@ $^ ++ $(AR) rv $@ $^ + + newt.o $(SHAREDDIR)/newt.o: newt.c Makefile + +Index: newt-0.52.20/configure.ac +=================================================================== +--- newt-0.52.20.orig/configure.ac ++++ newt-0.52.20/configure.ac +@@ -15,6 +15,10 @@ AC_PROG_INSTALL + AC_PROG_LN_S + AC_PROG_GREP + AC_SYS_LARGEFILE ++AN_MAKEVAR([AR], [AC_PROG_AR]) ++AN_PROGRAM([ar], [AC_PROG_AR]) ++AC_DEFUN([AC_PROG_AR], [AC_CHECK_TOOL(AR, ar, :)]) ++AC_PROG_AR + + AC_CHECK_SIZEOF([long]) + AC_CHECK_SIZEOF([long long]) diff --git a/meta-openembedded/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb b/meta-openembedded/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb new file mode 100644 index 0000000000..1e39a1c5ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/newt/libnewt_0.52.24.bb @@ -0,0 +1,56 @@ +SUMMARY = "A library for text mode user interfaces" + +DESCRIPTION = "Newt is a programming library for color text mode, widget based user \ +interfaces. Newt can be used to add stacked windows, entry widgets, \ +checkboxes, radio buttons, labels, plain text fields, scrollbars, \ +etc., to text mode user interfaces. This package also contains the \ +shared library needed by programs built with newt, as well as a \ +/usr/bin/dialog replacement called whiptail. Newt is based on the \ +slang library." + +HOMEPAGE = "https://releases.pagure.org/newt/" +SECTION = "libs" + +LICENSE = "LGPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" + +# slang needs to be >= 2.2 +DEPENDS = "slang popt python3" + +SRC_URI = "https://releases.pagure.org/newt/newt-${PV}.tar.gz \ + file://cross_ar.patch \ + file://Makefile.in-Add-tinfo-library-to-the-linking-librari.patch \ + file://0001-detect-gold-as-GNU-linker-too.patch \ + " + +SRC_URI[sha256sum] = "5ded7e221f85f642521c49b1826c8de19845aa372baf5d630a51774b544fbdbb" + +S = "${WORKDIR}/newt-${PV}" + +inherit autotools-brokensep python3native python3-dir python3targetconfig + +EXTRA_OECONF = "--without-tcl --with-python" + +EXTRA_OEMAKE += "PYTHONVERS=${PYTHON_DIR}" + +CLEANBROKEN = "1" + +export CPPFLAGS + +PACKAGES:prepend = "whiptail ${PN}-python " + +RDEPENDS:${PN}-python += "python3-core" +FILES:${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*" + +do_configure:prepend() { + sh autogen.sh +} + +do_compile:prepend() { + # Make sure the recompile is OK + rm -f ${B}/.depend +} + +FILES:whiptail = "${bindir}/whiptail" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.6.bb b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.7.bb index 7f30dbfc5a..8cecf53349 100644 --- a/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.6.bb +++ b/meta-openembedded/meta-oe/recipes-extended/ostree/ostree_2024.7.bb @@ -22,7 +22,7 @@ GITHUB_BASE_URI = "https://github.com/ostreedev/ostree/releases" SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/libostree-${PV}.tar.xz \ file://run-ptest \ " -SRC_URI[sha256sum] = "8b61c856697aa412f2f1724322ada40bdd7b1bf9e7783e2c594faa7a594f868f" +SRC_URI[sha256sum] = "72451efffe5a10acb4cfdd6eb849db97fa9e61a81e4113fc656eece77eb93355" S = "${WORKDIR}/libostree-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb index e795482eb6..498623cc83 100644 --- a/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb +++ b/meta-openembedded/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb @@ -17,6 +17,9 @@ SRC_URI = "http://downloads.sourceforge.net/p7zip/p7zip/${PV}/p7zip_${PV}_src_al SRC_URI[md5sum] = "a0128d661cfe7cc8c121e73519c54fbf" SRC_URI[sha256sum] = "5eb20ac0e2944f6cb9c2d51dd6c4518941c185347d4089ea89087ffdd6e2341f" +UPSTREAM_CHECK_URI = "https://tracker.debian.org/pkg/p7zip" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/${BPN}_${PV}" do_compile:append() { diff --git a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb index 81d0746f89..1637389dba 100644 --- a/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb +++ b/meta-openembedded/meta-oe/recipes-extended/pam/pam-plugin-ccreds_11.bb @@ -15,6 +15,9 @@ SRC_URI = "git://github.com/PADL/pam_ccreds;branch=master;protocol=https \ file://0001-configure-Check-for-function-from-libdb-during-confi.patch \ " +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/run-ptest b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/run-ptest new file mode 100644 index 0000000000..e819628c9f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl/run-ptest @@ -0,0 +1,23 @@ +#!/bin/sh + +fail_count=0 +all_count=0 + +for test_suite in src/test/pegtl/pegtl-test-* +do + if "./$test_suite" + then + echo "PASS: $test_suite" + else + echo "FAIL: $test_suite" + fail_count=$((fail_count + 1)) + fi + all_count=$((all_count + 1)) +done + +if [ $fail_count -eq 0 ] +then + echo "PASS: All $all_count tests passed" +else + echo "FAIL: $fail_count of $all_count tests failed" +fi diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb deleted file mode 100644 index 237828dbfc..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.7.bb +++ /dev/null @@ -1,13 +0,0 @@ -DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" -HOMEPAGE="https://github.com/taocpp/PEGTL" -LICENSE="MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" - -SRC_URI = "git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x" -SRCREV = "cf639f7f4ee125f68e1ccfba8d99ebc0de57b9fe" - -inherit cmake - -S = "${WORKDIR}/git" - -CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb new file mode 100644 index 0000000000..fc227734d8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/pegtl/pegtl_3.2.8.bb @@ -0,0 +1,24 @@ +DESCRIPTION="header-only library for creating parsers according to Parsing Expression Grammar" +HOMEPAGE="https://github.com/taocpp/PEGTL" +LICENSE="MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dccf35ef30bf912bb07b01d469965293" + +SRC_URI = " \ + git://github.com/taocpp/PEGTL.git;protocol=https;branch=3.x \ + file://run-ptest \ +" + +SRCREV = "be527327653e94b02e711f7eff59285ad13e1db0" + +inherit cmake ptest + +S = "${WORKDIR}/git" + +do_install_ptest () { + install -d ${D}${PTEST_PATH}/src/test/pegtl/data + install -m 0755 ${B}/src/test/pegtl/pegtl-test-* ${D}${PTEST_PATH}/src/test/pegtl + install ${S}/src/test/pegtl/file_*.txt ${D}${PTEST_PATH}/src/test/pegtl + install ${S}/src/test/pegtl/data/*.json ${D}${PTEST_PATH}/src/test/pegtl/data +} + +CXXFLAGS += " -Wno-error=type-limits" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch b/meta-openembedded/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch new file mode 100644 index 0000000000..445f2fbdb0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/files/meson-build-Support-openembedded-OS-for-PAM-config.patch @@ -0,0 +1,48 @@ +From 7c89b88f0f81ad220d08d69d212c14c6eeefb647 Mon Sep 17 00:00:00 2001 +From: Yoann Congal <yoann.congal@smile.fr> +Date: Tue, 3 Sep 2024 12:17:42 +0200 +Subject: [PATCH] meson.build: Support "openembedded" OS for PAM config + +In Openembedded, same as Suse/Solaris: PAM files are common-*: +* PAM_FILE_INCLUDE_AUTH: common-auth +* PAM_FILE_INCLUDE_ACCOUNT: common-account +* PAM_FILE_INCLUDE_PASSWORD: common-password +* PAM_FILE_INCLUDE_SESSION: common-session +See OE-Core libpam recipe. + +NB: This is also the same config as Debian but its not mentioned in the +code. + +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> +Upstream-Status: Backport [https://github.com/polkit-org/polkit/commit/1d4f7f4d9f3d74fb2649c96faa8677416c1aefc2] +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 302c189..a55f2d6 100644 +--- a/meson.build ++++ b/meson.build +@@ -311,7 +311,7 @@ endif + + pam_include = get_option('pam_include') + if pam_include == '' +- if ['suse', 'solaris'].contains(os_type) ++ if ['suse', 'solaris', 'openembedded'].contains(os_type) + pam_conf = { + 'PAM_FILE_INCLUDE_AUTH': 'common-auth', + 'PAM_FILE_INCLUDE_ACCOUNT': 'common-account', +diff --git a/meson_options.txt b/meson_options.txt +index c2e4a6c..14d7a50 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -6,7 +6,7 @@ option('polkitd_user', type: 'string', value: 'polkitd', description: 'User for + option('polkitd_uid', type: 'string', value: '-', description: 'Fixed UID for user running polkitd (polkitd)') + + option('authfw', type: 'combo', choices: ['pam', 'shadow', 'bsdauth'], value: 'pam', description: 'Authentication framework (pam/shadow)') +-option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', ''], value: '', description: 'distribution or OS') ++option('os_type', type: 'combo', choices: ['redhat', 'suse', 'gentoo', 'pardus', 'solaris', 'netbsd', 'lfs', 'openembedded', ''], value: '', description: 'distribution or OS') + + option('pam_include', type: 'string', value: '', description: 'pam file to include') + option('pam_module_dir', type: 'string', value: '', description: 'directory to install PAM security module') diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb index 2159482ebb..c0066d5636 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-datetime.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.timedate1.rules" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.timedate1.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb index bfd3361dfe..ec8ff868d4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-network.bb @@ -7,7 +7,7 @@ require polkit-group-rule.inc SRC_URI = "file://50-org.freedesktop.NetworkManager.rules" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.NetworkManager.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb index 8dc8c5e255..884590d47c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule-udisks2.bb @@ -10,7 +10,7 @@ SRC_URI = "file://50-org.freedesktop.udiskie.rules" RDEPENDS:${PN} += "udisks2" do_install() { - install -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${sysconfdir}/polkit-1/rules.d + install -D -m 0755 ${UNPACKDIR}/50-org.freedesktop.udiskie.rules ${D}${datadir}/polkit-1/rules.d } USERADD_PACKAGES = "${PN}" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc index 4aeeb77d04..f57ca2611b 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit-group-rule.inc @@ -6,8 +6,4 @@ REQUIRED_DISTRO_FEATURES = "polkit" inherit useradd -do_install:prepend() { - install -m 700 -d ${D}${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d -} -USERADD_PARAM:${PN}:prepend = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;" +FILES:${PN} += "${datadir}/polkit-1/rules.d" diff --git a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_124.bb b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_125.bb index 9e2eb05c62..a67aaf908f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_124.bb +++ b/meta-openembedded/meta-oe/recipes-extended/polkit/polkit_125.bb @@ -1,13 +1,16 @@ -SUMMARY = "PolicyKit Authorization Framework" +SUMMARY = "Polkit Authorization Framework" DESCRIPTION = "The polkit package is an application-level toolkit for defining and handling the policy that allows unprivileged processes to speak to privileged processes." HOMEPAGE = "http://www.freedesktop.org/wiki/Software/polkit" LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=155db86cdbafa7532b41f390409283eb" +BUGTRACKER = "https://github.com/polkit-org/polkit/issues" -SRC_URI = "git://gitlab.freedesktop.org/polkit/polkit.git;protocol=https;branch=master" +SRC_URI = "git://github.com/polkit-org/polkit.git;protocol=https;branch=main \ + file://meson-build-Support-openembedded-OS-for-PAM-config.patch \ + " S = "${WORKDIR}/git" -SRCREV = "82f0924dc0eb23b9df68e88dbaf9e07c81940a5a" +SRCREV = "112752c12da812a163dac67d7f675b60de8f7d7b" DEPENDS = "expat glib-2.0" @@ -15,6 +18,10 @@ inherit meson pkgconfig useradd systemd gettext gobject-introspection features_c REQUIRED_DISTRO_FEATURES = "polkit" +# Prevent meson.build to try to autodetect host OS (which could lead to +# non-reproducibility) +EXTRA_OEMESON = "-Dos_type=openembedded" + PACKAGECONFIG = " \ ${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'consolekit', d)} \ @@ -24,8 +31,10 @@ PACKAGECONFIG = " \ PACKAGECONFIG[dbus] = ",,dbus" PACKAGECONFIG[gtk-doc] = "-Dgtk_doc=true,-Dgtk_doc=false,gtk-doc-native" PACKAGECONFIG[pam] = "-Dauthfw=pam,-Dauthfw=shadow,libpam,libpam" -PACKAGECONFIG[systemd] = "-Dsession_tracking=libsystemd-login,-Dsession_tracking=ConsoleKit,systemd" -PACKAGECONFIG[consolekit] = ",,,consolekit" +PACKAGECONFIG[systemd] = "-Dsession_tracking=logind,,systemd,,,consolekit elogind" +PACKAGECONFIG[consolekit] = "-Dsession_tracking=ConsoleKit,,,consolekit,,systemd elogind" +PACKAGECONFIG[elogind] = "-Dsession_tracking=libelogin,,elogind,,,systemd consolekit" +PACKAGECONFIG[libs-only] = "-Dlibs-only=true,-Dlibs-only=false" # Default to mozjs javascript library PACKAGECONFIG[mozjs] = "-Djs_engine=mozjs,,mozjs-115,,,duktape" @@ -42,18 +51,26 @@ SYSTEMD_AUTO_ENABLE = "disable" do_install:append() { #Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d + if ${@bb.utils.contains('PACKAGECONFIG', 'libs-only', 'false', 'true', d)}; then + chmod 700 ${D}/${sysconfdir}/polkit-1/rules.d + chown polkitd:root ${D}/${sysconfdir}/polkit-1/rules.d + fi + + # Polkit unconditionally installs a systemd service, remove it on SysVinit + # systems to avoid "installed but not packaged file" error. + if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then + rm -r ${D}${libdir}/systemd + fi } FILES:${PN} += " \ ${libdir}/pam.d/polkit-1 \ ${libdir}/sysusers.d \ + ${libdir}/tmpfiles.d \ ${libdir}/polkit-1 \ ${nonarch_libdir}/pam.d/polkit-1 \ ${nonarch_libdir}/sysusers.d \ + ${nonarch_libdir}/tmpfiles.d \ ${nonarch_libdir}/polkit-1 \ ${datadir} \ " diff --git a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb index 25951c9de4..029ec2337e 100644 --- a/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/properties-cpp/properties-cpp_git.bb @@ -11,6 +11,9 @@ PV = "0.0.1+git" SRCREV = "45863e849b39c4921d6553e6d27e267a96ac7d77" SRC_URI = "git://github.com/lib-cpp/${BPN}.git;branch=master;protocol=https" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_configure:prepend() { diff --git a/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb index 0bc94121a7..c68469fce5 100644 --- a/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/qad/qad_git.bb @@ -14,6 +14,9 @@ SRC_URI = "git://gitlab.com/CodethinkLabs/qad/qad;branch=main;protocol=https \ SRCREV = "ae0c099c1fdc0ca6f5d631cea6b302937122b362" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" PV = "0.0+git" diff --git a/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb index f90e814f7a..b04d8df131 100644 --- a/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_1.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/qcbor/qcbor_1.4.1.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=498c298542365dfcfe29948c72a5849b" SRC_URI = "git://github.com/laurencelundblade/QCBOR;protocol=https;branch=master" -SRCREV = "1eba85dbbe78fc1938f8aba2112ba1b228caed30" +SRCREV = "4487f10e1bf258434fb8a39e4f59c29e31910ad0" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.5.bb b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.5.bb index bfb46240a7..930c1cd9a3 100644 --- a/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.5.bb +++ b/meta-openembedded/meta-oe/recipes-extended/redis/redis_7.2.5.bb @@ -68,3 +68,5 @@ INITSCRIPT_NAME = "redis-server" INITSCRIPT_PARAMS = "defaults 87" SYSTEMD_SERVICE:${PN} = "redis.service" + +CVE_STATUS[CVE-2022-3734] = "not-applicable-platform: CVE only applies for Windows." diff --git a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb index d843f82b27..af19043eff 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rrdtool/rrdtool_1.8.0.bb @@ -135,3 +135,7 @@ RDEPENDS:${PN}-python = "python3" FILES:${PN}-dbg += "${libdir}/perl/vendor_perl/*/auto/RRDs/.debug \ ${PYTHON_SITEPACKAGES_DIR}/.debug" + +# http://errors.yoctoproject.org/Errors/Details/766911/ +# rrd_tune.c:239:35: error: passing argument 3 of 'optparse_init' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch index c1480406fe..13d1a78143 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/0001-tests-disable-the-check-for-inotify.patch @@ -1,4 +1,4 @@ -From 194e199ce08acc2192f6a63420ff24d9064666e5 Mon Sep 17 00:00:00 2001 +From 640b191b9566a6c18af73bf9cc4b9366a76acf62 Mon Sep 17 00:00:00 2001 From: Yi Fan Yu <yifan.yu@windriver.com> Date: Sat, 27 Mar 2021 19:18:25 -0400 Subject: [PATCH] tests: disable the check for inotify @@ -20,10 +20,10 @@ Signed-off-by: Yi Fan Yu <yifan.yu@windriver.com> 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/diag.sh b/tests/diag.sh -index 6cd60ea88..7424f48c5 100755 +index f4f3d86..497bb17 100755 --- a/tests/diag.sh +++ b/tests/diag.sh -@@ -2672,7 +2672,7 @@ case $1 in +@@ -2950,7 +2950,7 @@ case $1 in fi ;; 'check-inotify') # Check for inotify/fen support @@ -32,7 +32,7 @@ index 6cd60ea88..7424f48c5 100755 echo [inotify mode] elif [ -n "$(find /usr/include/sys/ -name 'port.h' -print -quit)" ]; then grep -qF "PORT_SOURCE_FILE" < /usr/include/sys/port.h -@@ -2687,7 +2687,7 @@ case $1 in +@@ -2965,7 +2965,7 @@ case $1 in fi ;; 'check-inotify-only') # Check for ONLY inotify support @@ -41,6 +41,3 @@ index 6cd60ea88..7424f48c5 100755 echo [inotify mode] else echo [inotify not supported, skipping...] --- -2.29.2 - diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch index 0352587268..45359a1663 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog/use-pkgconfig-to-check-libgcrypt.patch @@ -1,4 +1,4 @@ -From d0852006bf3d305e8984b85b41997d43d4476937 Mon Sep 17 00:00:00 2001 +From ceeaadb282531a416c1f605fa2100faa5de701e0 Mon Sep 17 00:00:00 2001 From: Roy Li <rongqing.li@windriver.com> Date: Wed, 18 Jun 2014 13:46:52 +0800 Subject: [PATCH] use pkgconfig to check libgcrypt @@ -10,16 +10,15 @@ libgcrypt does no longer provide libgcrypt-config, and provide Signed-off-by: Roy Li <rongqing.li@windriver.com> Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> - --- configure.ac | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/configure.ac b/configure.ac -index 62178c3..b56c9c7 100644 +index 4af95c4..97e6282 100644 --- a/configure.ac +++ b/configure.ac -@@ -889,20 +889,7 @@ AC_ARG_ENABLE(libgcrypt, +@@ -1200,20 +1200,7 @@ AC_ARG_ENABLE(libgcrypt, [enable_libgcrypt=yes] ) if test "x$enable_libgcrypt" = "xyes"; then @@ -40,4 +39,4 @@ index 62178c3..b56c9c7 100644 + PKG_CHECK_MODULES(LIBGCRYPT, libgcrypt) fi AM_CONDITIONAL(ENABLE_LIBGCRYPT, test x$enable_libgcrypt = xyes) - AC_SUBST(LIBGCRYPT_CFLAGS) + AM_CONDITIONAL(ENABLE_RSCRYUTIL, test x$enable_libgcrypt = xyes || test x$enable_openssl_crypto_provider = xyes) diff --git a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb index ac1645f671..cf833de22c 100644 --- a/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2404.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/rsyslog/rsyslog_8.2408.0.bb @@ -32,18 +32,19 @@ SRC_URI:append:libc-musl = " \ file://0001-Include-sys-time-h.patch \ file://disable-omfile-outchannel.patch \ " -SRC_URI[sha256sum] = "30528d140ec1b1f079224081fa37df6e06587ff42b02e3e61f2daa0526c54d33" +SRC_URI[sha256sum] = "8bb2f15f9bf9bb7e635182e3d3e370bfc39d08bf35a367dce9714e186f787206" -UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/releases" +UPSTREAM_CHECK_URI = "https://github.com/rsyslog/rsyslog/tags" UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig systemd update-rc.d ptest -EXTRA_OECONF += "--disable-generate-man-pages ap_cv_atomic_builtins=yes" -EXTRA_OECONF += "--enable-imfile-tests" -EXTRA_OECONF:remove:mipsarch = "ap_cv_atomic_builtins=yes" -EXTRA_OECONF:remove:powerpc = "ap_cv_atomic_builtins=yes" -EXTRA_OECONF:remove:riscv32 = "ap_cv_atomic_builtins=yes" +EXTRA_OECONF += "--enable-imfile-tests ${ATOMICS}" +ATOMICS = "ap_cv_atomic_builtins_64=yes ap_cv_atomic_builtins=yes" +ATOMICS:mipsarch = "" +ATOMICS:powerpc = "" +ATOMICS:riscv32 = "" +ATOMICS:armv5 = "" # first line is default yes in configure PACKAGECONFIG ??= " \ diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch deleted file mode 100644 index 41f98281f8..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-eh-no-give-up-share-detection.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 9db4c0f6bc0dd11c77b54296fce6b8afe18f4325 Mon Sep 17 00:00:00 2001 -From: Steffen Nurpmeso <steffen@sdaoden.eu> -Date: Thu, 9 Jun 2022 18:26:38 +0800 -Subject: [PATCH] su_INLINE: eh no; give up, share detection with clang but for - a thing - -Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=de2a44c393a39d80ddf12154aec94cace84b19c1] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - include/su/code.h | 34 +++++++++------------------------- - 1 file changed, 9 insertions(+), 25 deletions(-) - -diff --git a/include/su/code.h b/include/su/code.h -index 9683f4a..c7a2af3 100644 ---- a/include/su/code.h -+++ b/include/su/code.h -@@ -308,29 +308,8 @@ do{\ - # ifdef DOXYGEN - # define su_INLINE inline - # define su_SINLINE inline --# elif su_CC_GCC --# if !su_CC_VCHECK_GCC(3, 1) --# define su_INLINE extern __inline__ --# define su_SINLINE static __inline__ --# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ --# define su_INLINE extern __inline __attribute__((always_inline)) --# define su_SINLINE static __inline __attribute__((always_inline)) -- /* gcc 8.3.0 bug: does not gracefully inline with -Os -- * gcc 12.1.0 bug: ditto, -Og -- * Thus: always gcc-specific! */ --# elif 1 /*!defined __OPTIMIZE__ || \ -- !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ --# define su_INLINE extern __inline __attribute__((gnu_inline)) --# define su_SINLINE static __inline __attribute__((gnu_inline)) --# elif !defined NDEBUG || !defined __OPTIMIZE__ --# define su_INLINE static inline --# define su_SINLINE static inline --# else --# define su_INLINE inline --# define su_SINLINE static inline --# endif --# elif su_CC_CLANG || su_CC_PCC --# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901L -+# elif su_CC_CLANG || su_CC_GCC || su_CC_PCC -+# if defined __STDC_VERSION__ && __STDC_VERSION__ +0 >= 199901l - # if !defined NDEBUG || !defined __OPTIMIZE__ - # define su_INLINE static inline - # define su_SINLINE static inline -@@ -340,8 +319,13 @@ do{\ - # define su_SINLINE static inline __attribute__((always_inline)) - # endif - # else --# define su_INLINE static __inline --# define su_SINLINE static __inline -+# if su_CC_VCHECK_GCC(3, 1) -+# define su_INLINE static __inline __attribute__((always_inline)) -+# define su_SINLINE static __inline __attribute__((always_inline)) -+# else -+# define su_INLINE static __inline -+# define su_SINLINE static __inline -+# endif - # endif - # else - # define su_INLINE static /* TODO __attribute__((unused)) alike? */ --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch b/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch deleted file mode 100644 index 37ecb0c1ff..0000000000 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/files/0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5429b9e343c808951b1418d8626e544c9dcb28de Mon Sep 17 00:00:00 2001 -From: Steffen Nurpmeso <steffen@sdaoden.eu> -Date: Thu, 9 Jun 2022 18:06:04 +0800 -Subject: [PATCH] su_INLINE: gcc: only GNU specifics after -Og - -Upstream-Status: Backport [https://git.sdaoden.eu/browse/s-nail.git/commit/?id=c5544b66c3b4b2e161166562349908a07e324b38] - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - include/su/code.h | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/include/su/code.h b/include/su/code.h -index 4d552c1..9683f4a 100644 ---- a/include/su/code.h -+++ b/include/su/code.h -@@ -309,16 +309,17 @@ do{\ - # define su_INLINE inline - # define su_SINLINE inline - # elif su_CC_GCC -- /* After lots of trouble with OpenBSD/gcc 4.2.1 and SunOS/gcc 3.4.3 */ --# if !su_CC_VCHECK_GCC(3, 2) /* Unsure: only used C++ at that time */ --# define su_INLINE extern __inline --# define su_SINLINE static __inline --# elif !su_CC_VCHECK_GCC(4, 3) -+# if !su_CC_VCHECK_GCC(3, 1) -+# define su_INLINE extern __inline__ -+# define su_SINLINE static __inline__ -+# elif !defined __GNUC_GNU_INLINE__ /*4.1.3; !su_CC_VCHECK_GCC(4, 2)*/ - # define su_INLINE extern __inline __attribute__((always_inline)) - # define su_SINLINE static __inline __attribute__((always_inline)) -- /* xxx gcc 8.3.0 bug: does not truly inline with -Os */ --# elif !su_CC_VCHECK_GCC(8, 3) || !defined __OPTIMIZE__ ||\ -- !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L -+ /* gcc 8.3.0 bug: does not gracefully inline with -Os -+ * gcc 12.1.0 bug: ditto, -Og -+ * Thus: always gcc-specific! */ -+# elif 1 /*!defined __OPTIMIZE__ || \ -+ !defined __STDC_VERSION__ || __STDC_VERSION__ +0 < 199901L*/ - # define su_INLINE extern __inline __attribute__((gnu_inline)) - # define su_SINLINE static __inline __attribute__((gnu_inline)) - # elif !defined NDEBUG || !defined __OPTIMIZE__ --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb index bcdb1e4788..93a852a6df 100644 --- a/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.24.bb +++ b/meta-openembedded/meta-oe/recipes-extended/s-nail/s-nail_14.9.25.bb @@ -8,11 +8,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=87266591c81260f10221f1f38872d023" SRC_URI = "https://ftp.sdaoden.eu/${BP}.tar.xz \ file://make-errors.patch \ file://0001-make.rc-set-VAL_MTA.patch \ - file://0001-su_INLINE-gcc-only-GNU-specifics-after-Og.patch \ - file://0001-su_INLINE-eh-no-give-up-share-detection.patch \ file://0001-mk-make-config.sh-not-reveal-the-build-env.patch \ " -SRC_URI[sha256sum] = "2714d6b8fb2af3b363fc7c79b76d058753716345d1b6ebcd8870ecd0e4f7ef8c" +SRC_URI[sha256sum] = "20ff055be9829b69d46ebc400dfe516a40d287d7ce810c74355d6bdc1a28d8a9" DEPENDS = "coreutils-native" diff --git a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.4.bb index 3b558cafcb..9e879ff384 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sanlock/sanlock_3.9.4.bb @@ -17,7 +17,7 @@ SRC_URI = "git://pagure.io/sanlock.git;protocol=http;branch=master \ file://0001-sanlock-Replace-cp-a-with-cp-R-no-dereference-preser.patch \ file://0001-add-missing-system-header-string.h.patch \ " -SRCREV = "79b35bba8298f4444923c15e11bed38380cb18ee" +SRCREV = "e077f1a99a07c32ef460db89ed395b441f5e8b03" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb index 0e5fc7b6bb..b71ad234e4 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-cmpi-devel/sblim-cmpi-devel_2.0.3.bb @@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/sblim/${BP}.tar.bz2 \ SRC_URI[md5sum] = "b934616f88a848f17ca3cf1b9e792cbf" SRC_URI[sha256sum] = "1671cabff6b922b6fde897673d9fdafd56c9310f82a7eacc0547d596b9cdfea6" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/development%20pkgs/sblim-cmpi-devel/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + inherit autotools BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb index 4e90215c0e..d2bab6ce5f 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfc-common/sblim-sfc-common_1.0.1.bb @@ -14,6 +14,8 @@ SRC_URI = "http://downloads.sourceforge.net/sblim/sblim-sfcCommon-${PV}.tar.bz2" SRC_URI[md5sum] = "8aa2655d97bdea54c4750f220b40990c" SRC_URI[sha256sum] = "b9b1037173d6ae0181c3bd5a316ddab5afd6a342ad0dbdc18e940fc0ad2c3297" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sblim/files/sblim-sfcCommon/" + inherit autotools do_install() { diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch new file mode 100644 index 0000000000..5e8f4fa0d5 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch @@ -0,0 +1,72 @@ +From 5151163d6f4d4de0699d1e85c54fbe2cb5b55460 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Thu, 27 Jun 2024 01:51:36 +0000 +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c: In function 'main': +| ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types] +| 86 | showClass(data.value.cls); +| | ~~~~~~~~~~^~~~ +| | | +| | CIMCClass * {aka struct _CIMCClass *} +| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ec.c:7: +| ../../sblim-sfcc-2.2.8/TEST/show.h:9:34: note: expected 'CMPIConstClass *' {aka 'struct _CMPIConstClass *'} but argument is of type 'CIMCClass *' {aka 'struct _CIMCClass *'} +| 9 | void showClass( CMPIConstClass * in_class ); +| | ~~~~~~~~~~~~~~~~~^~~~~~~~ + +| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c: In function 'main': +| ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types] +| 96 | showObjectPath(data.value.ref); +| | ~~~~~~~~~~^~~~ +| | | +| | CIMCObjectPath * {aka struct _CIMCObjectPath *} +| In file included from ../../sblim-sfcc-2.2.8/TEST/v2test_ein.c:7: +| ../../sblim-sfcc-2.2.8/TEST/show.h:7:39: note: expected 'CMPIObjectPath *' {aka 'struct _CMPIObjectPath *'} but argument is of type 'CIMCObjectPath *' {aka 'struct _CIMCObjectPath *'} +| 7 | void showObjectPath( CMPIObjectPath * objectpath ); +| | ~~~~~~~~~~~~~~~~~^~~~~~~~~~ +| make[2]: *** [Makefile:1110: v2test_ein.o] Error 1 +| make[2]: *** Waiting for unfinished jobs.... +| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c: In function 'main': +| ../../sblim-sfcc-2.2.8/TEST/v2test_im.c:82:40: warning: '%s' directive argument is null [-Wformat-overflow=] +| 82 | printf( "invokeMethod() rc=%d, msg=%s\n", +| | ^~ + +Upstream-Status: Backport +[https://github.com/kkaempf/sblim-sfcc/commit/881fccbaf19e26cbef3da1bebe2b42b3a9de1147#diff-ad9eeee99837ead0f29c70cd5f3956178dc3d51bd79618affd53d72a31404d5f] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + TEST/v2test_ec.c | 2 +- + TEST/v2test_ein.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/TEST/v2test_ec.c b/TEST/v2test_ec.c +index 940ca57..72a93a5 100644 +--- a/TEST/v2test_ec.c ++++ b/TEST/v2test_ec.c +@@ -83,7 +83,7 @@ int main() + count = enm->ft->hasNext(enm, NULL) ; + while (count > 0) { + data = enm->ft->getNext(enm, NULL); +- showClass(data.value.cls); ++ showClass((CMPIConstClass *)data.value.cls); + /* + * see if we have any more + */ +diff --git a/TEST/v2test_ein.c b/TEST/v2test_ein.c +index ede95c1..c9d1152 100644 +--- a/TEST/v2test_ein.c ++++ b/TEST/v2test_ein.c +@@ -93,7 +93,7 @@ int count = 0; + + data = enm->ft->getNext(enm, NULL); + +- showObjectPath(data.value.ref); ++ showObjectPath((CMPIObjectPath *)data.value.ref); + /* + * see if we have any more + */ +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb index c9d3ddd6b2..4eb1c2f259 100644 --- a/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb +++ b/meta-openembedded/meta-oe/recipes-extended/sblim-sfcc/sblim-sfcc_2.2.8.bb @@ -5,14 +5,22 @@ HOMEPAGE = "http://www.sblim.org" SRC_URI = "http://netcologne.dl.sourceforge.net/project/sblim/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0001-cimxml-Include-sys-select.h-for-fd_set.patch \ file://0001-Fix-implicit-function-declarations.patch \ + file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ " SRC_URI[md5sum] = "0bac0dec19f17ec065b6c332a56d7bae" SRC_URI[sha256sum] = "1b8f187583bc6c6b0a63aae0165ca37892a2a3bd4bb0682cd76b56268b42c3d6" +UPSTREAM_CHECK_URI="https://sourceforge.net/projects/sblim/files/sblim-sfcc/" + LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=f300afd598546add034364cd0a533261" DEPENDS = "curl" inherit autotools + +# http://errors.yoctoproject.org/Errors/Details/766897/ +# sblim-sfcc-2.2.8/TEST/v2test_ec.c:86:31: error: passing argument 1 of 'showClass' from incompatible pointer type [-Wincompatible-pointer-types] +# sblim-sfcc-2.2.8/TEST/v2test_ein.c:96:36: error: passing argument 1 of 'showObjectPath' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb index ab97356e9b..fa43c9de58 100644 --- a/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/socketcan/can-isotp_git.bb @@ -5,6 +5,8 @@ PV = "1.0+git" SRC_URI = "git://github.com/hartkopp/can-isotp.git;protocol=https;branch=master" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf new file mode 100644 index 0000000000..39ed83d6af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils/tipcutils.conf @@ -0,0 +1 @@ +tipc diff --git a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb index 596aa260e7..71b62cc513 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tipcutils/tipcutils_git.bb @@ -3,6 +3,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://tipclog/tipc.h;endline=35;md5=985b6ea8735818511d276c1b466cce98" SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ + file://tipcutils.conf \ file://0001-include-sys-select.h-for-FD_-definitions.patch \ file://0002-replace-non-standard-uint-with-unsigned-int.patch \ file://0001-multicast_blast-tipcc-Fix-struct-type-for-TIPC_GROUP.patch \ @@ -11,7 +12,7 @@ SRC_URI = "git://git.code.sf.net/p/tipc/tipcutils;branch=master \ SRCREV = "7ab2211b87414ba240b0b2e4af219c1057c9cf9a" PV = "2.2.0+git" -inherit autotools pkgconfig +inherit autotools pkgconfig systemd DEPENDS += "libdaemon" @@ -41,8 +42,16 @@ do_install:append() { install -d ${D}${sysconfdir} cp -R --no-dereference --preserve=mode,links -v ${S}/scripts/etc/* ${D}${sysconfdir}/ chown -R root:root ${D}${sysconfdir} + + # Install systemd related configuration file + if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then + install -d ${D}${sysconfdir}/modules-load.d + install -m 0644 ${UNPACKDIR}/tipcutils.conf ${D}${sysconfdir}/modules-load.d + fi } +SYSTEMD_SERVICE:${PN} = "" + PACKAGES += "${PN}-demos" FILES:${PN}-dbg += "/opt/tipcutils/demos/*/.debug /opt/tipcutils/ptts/.debug" FILES:${PN}-demos = "/opt/tipcutils/*" diff --git a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.3a.bb b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.4.bb index 5187222838..4360edf4ba 100644 --- a/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.3a.bb +++ b/meta-openembedded/meta-oe/recipes-extended/tmux/tmux_3.4.bb @@ -5,13 +5,13 @@ SECTION = "console/utils" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://tmux.c;beginline=3;endline=17;md5=f256b76d52e7b4d02bf19144bdaca107" -DEPENDS = "ncurses libevent" +DEPENDS = "ncurses libevent bison-native" SRC_URI = "https://github.com/tmux/tmux/releases/download/${PV}/tmux-${PV}.tar.gz" -SRC_URI[md5sum] = "8eee5883b9f6550fa4efaad0c9ec38f3" -SRC_URI[sha256sum] = "e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f" +SRC_URI[sha256sum] = "551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa" UPSTREAM_CHECK_URI = "https://github.com/tmux/tmux/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb index 6a99e8d29b..93daafbebe 100644 --- a/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb +++ b/meta-openembedded/meta-oe/recipes-extended/uml-utilities/uml-utilities_20040406.bb @@ -14,6 +14,7 @@ SRC_URI = "http://downloads.sourceforge.net/project/user-mode-linux/tools/1/uml_ SRC_URI[md5sum] = "2c1ccd9efacbfb39e42d482b89b2550a" SRC_URI[sha256sum] = "4f179b1db021ef15ac7e9b2eed57c525db127a754c574f591c367460cded9f41" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/user-mode-linux/files/tools/1/" S = "${WORKDIR}/tools" diff --git a/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb index 1a75922277..948d8a2818 100644 --- a/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-extended/vlock/vlock_2.2.3.bb @@ -9,7 +9,7 @@ SECTION = "utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" -SRC_URI = "${GENTOO_MIRROR}/${BP}.tar.gz \ +SRC_URI = "${GENTOO_MIRROR}/37/${BP}.tar.gz \ file://disable_vlockrc.patch \ file://vlock_pam_tally2_reset.patch \ file://vlock-no_tally.patch \ diff --git a/meta-openembedded/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb b/meta-openembedded/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb index 785ae50e9e..d4a8b49e1d 100644 --- a/meta-openembedded/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-extended/wtmpdb/wtmpdb_0.11.0.bb @@ -19,7 +19,7 @@ REQUIRED_DISTRO_FEATURES = "pam" SYSTEMD_SERVICE:${PN} = "wtmpdb-update-boot.service wtmpdb-rotate.service" -EXTRA_OEMESON = " -Dpamlibdir=${libdir}" +EXTRA_OEMESON = " -Dpamlibdir=${base_libdir}/security" do_install:append () { if [ -d ${D}${prefix}/lib/systemd -a ${D}${prefix}/lib != `dirname ${D}${systemd_unitdir}` ]; then @@ -33,3 +33,4 @@ do_install:append () { FILES:${PN} += " ${systemd_system_unitdir} " FILES:${PN} += " ${libdir} " FILES:${PN} += " ${nonarch_libdir}/tmpfiles.d/* " +FILES:${PN} += " ${base_libdir}/security/*.so " diff --git a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb index 800dd6b7c4..89292118d0 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zram/zram_0.2.bb @@ -17,6 +17,9 @@ SRC_URI = " \ file://dev-zram0.swap \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_install () { # Install systemd related configuration file if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then diff --git a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb index 1bc4010f8a..be658561e2 100644 --- a/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb +++ b/meta-openembedded/meta-oe/recipes-extended/zsync/zsync-curl_git.bb @@ -12,9 +12,18 @@ SRCREV = "00141c2806ccc4ddf2ff6263ee1612d19c0b713f" PV = "0.6.2+git" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + inherit autotools S = "${WORKDIR}/git" AUTOTOOLS_SCRIPT_PATH = "${S}/src" BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766891/ +# git/src/libzsync/zsync.c:445:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] +# git/src/libzsync/zsync.c:450:18: error: returning 'char **' from a function with incompatible return type 'const char * const*' [-Wincompatible-pointer-types] +# git/src/libzsync/zsync.c:932:43: error: passing argument 4 of 'zsync_configure_zstream_for_zdata' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch new file mode 100644 index 0000000000..dd6ae1b427 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab/0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch @@ -0,0 +1,37 @@ +From 6fa1b6d3f72caf6d0cf61752b522dc19fb9933b7 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Fri, 30 Aug 2024 10:44:17 +0200 +Subject: [PATCH] gcab-enums.c.etemplate: include @basename@ instead of full + path from @filename@ + +* fixes: + ERROR: QA Issue: File /usr/src/debug/gcab/1.6/libgcab/gcab-enums.c in package gcab-src contains reference to TMPDIR [buildpaths] + +lib32-gcab/1.6/package $ grep -R styhead . +./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-file.h" +./usr/src/debug/lib32-gcab/1.6/libgcab/gcab-enums.c:#include "WORKDIR/build/../gcab-1.6/libgcab/gcab-folder.h" + +glib-mkenum supports also @basename@ since 2.22 which would avoid this QA issue + @filename@ name of current input file + @basename@ base name of the current input file (Since: 2.22) + +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Pending + + libgcab/gcab-enums.c.etemplate | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libgcab/gcab-enums.c.etemplate b/libgcab/gcab-enums.c.etemplate +index 194b1e0..2e85824 100644 +--- a/libgcab/gcab-enums.c.etemplate ++++ b/libgcab/gcab-enums.c.etemplate +@@ -21,7 +21,7 @@ + /*** END file-header ***/ + + /*** BEGIN file-production ***/ +-#include "@filename@" ++#include "@basename@" + /*** END file-production ***/ + + diff --git a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.6.bb b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.6.bb index 4278fc9453..503d25271f 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.6.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gcab/gcab_1.6.bb @@ -7,6 +7,7 @@ DEPENDS = "glib-2.0" SRC_URI = "\ ${GNOME_MIRROR}/gcab/${PV}/gcab-${PV}.tar.xz \ + file://0001-gcab-enums.c.etemplate-include-basename-instead-of-f.patch \ file://run-ptest \ " SRC_URI[sha256sum] = "2f0c9615577c4126909e251f9de0626c3ee7a152376c15b5544df10fc87e560b" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb index 54b37912b2..c49859afc5 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.13.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gmime/gmime_3.2.15.bb @@ -11,7 +11,10 @@ inherit gnomebase gobject-introspection vala gtk-doc SRC_URI = "https://github.com/jstedfast/${BPN}/releases/download/${PV}/${BP}.tar.xz \ file://iconv-detect.h \ " -SRC_URI[sha256sum] = "2e10a54d4821daf8b16c019ad5d567e0fb8e766f8ffe5fec3d4c6a37373d6406" +SRC_URI[sha256sum] = "84cd2a481a27970ec39b5c95f72db026722904a2ccf3fdbd57b280cf2d02b5c4" + +UPSTREAM_CHECK_URI = "https://github.com/jstedfast/gmime/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" EXTRA_OECONF += "--enable-largefile" diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb index 1cfd9c1cba..c929763763 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-doc-utils-stub/gnome-doc-utils-stub_1.0.bb @@ -5,8 +5,12 @@ it requires libxml2 and python 2 at the same time, which can no longer be satisf LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6 \ file://${COREBASE}/meta/files/common-licenses/LGPL-2.1-only;md5=1a6d268fd218675ffea8be556788b780" + SRC_URI = "file://gnome-doc-utils.m4" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PROVIDES = "gnome-doc-utils" do_install:append() { diff --git a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb index 3456383c3a..90756dac36 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gnome-themes/gnome-themes-extra_3.28.bb @@ -19,6 +19,9 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${PV}/${BPN}-${PV}.tar.xz;name=archive" SRC_URI[archive.md5sum] = "f9f2c6c521948da427f702372e16f826" SRC_URI[archive.sha256sum] = "7c4ba0bff001f06d8983cfc105adaac42df1d1267a2591798a780bac557a5819" +UPSTREAM_CHECK_URI = "https://gitlab.gnome.org/Archive/gnome-themes-extra/-/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + EXTRA_OECONF = "--disable-gtk2-engine" do_install:append() { diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch new file mode 100644 index 0000000000..dfa54f2f31 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+/CVE-2024-6655.patch @@ -0,0 +1,40 @@ +From 3bbf0b6176d42836d23c36a6ac410e807ec0a7a7 Mon Sep 17 00:00:00 2001 +From: Matthias Clasen <mclasen@redhat.com> +Date: Sat, 15 Jun 2024 14:18:01 -0400 +Subject: [PATCH] Stop looking for modules in cwd + +This is just not a good idea. It is surprising, and can be misused. + +Fixes: #6786 + +CVE: CVE-2024-6655 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7] + +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> +--- + gtk/gtkmodules.c | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/gtk/gtkmodules.c b/gtk/gtkmodules.c +index e09b583..e75810c 100644 +--- a/gtk/gtkmodules.c ++++ b/gtk/gtkmodules.c +@@ -225,13 +225,8 @@ find_module (const gchar *name) + gchar *module_name; + + module_name = _gtk_find_module (name, "modules"); +- if (!module_name) +- { +- /* As last resort, try loading without an absolute path (using system +- * library path) +- */ +- module_name = g_module_build_path (NULL, name); +- } ++ if (module_name == NULL) ++ return NULL; + + module = g_module_open (module_name, G_MODULE_BIND_LOCAL | G_MODULE_BIND_LAZY); + +-- +2.40.0 diff --git a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb index 74b0531414..d55aa8d285 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/gtk+/gtk+_2.24.33.bb @@ -11,6 +11,7 @@ SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://strict-prototypes.patch \ file://0001-Do-not-look-into-HOME-when-looking-for-gtk-modules.patch \ file://0001-Fix-signature-of-create_menu-function.patch \ + file://CVE-2024-6655.patch \ " SRC_URI[sha256sum] = "ac2ac757f5942d318a311a54b0c80b5ef295f299c2a73c632f6bfb1ff49cc6da" diff --git a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb index 2d95e14447..7dc88d7279 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/libjcat/libjcat_0.2.1.bb @@ -32,3 +32,5 @@ GTKDOC_MESON_OPTION = "gtkdoc" RDEPENDS:${PN}:class-target = "\ ${@bb.utils.contains('PACKAGECONFIG', 'gpg', 'gnupg', '', d)} \ " + +INSANE_SKIP:${PN}-ptest += "buildpaths" diff --git a/meta-openembedded/meta-oe/recipes-gnome/malcontent/malcontent.bb b/meta-openembedded/meta-oe/recipes-gnome/malcontent/malcontent.bb index c4bc50fa8e..b30d85080b 100644 --- a/meta-openembedded/meta-oe/recipes-gnome/malcontent/malcontent.bb +++ b/meta-openembedded/meta-oe/recipes-gnome/malcontent/malcontent.bb @@ -17,7 +17,7 @@ DEPENDS = " \ GIR_MESON_OPTION = "" -inherit meson pkgconfig gobject-introspection gettext features_check useradd +inherit meson pkgconfig gobject-introspection gettext features_check REQUIRED_DISTRO_FEATURES = "pam polkit gobject-introspection" @@ -26,15 +26,6 @@ PACKAGECONFIG[ui] = ",,,malcontent-ui" EXTRA_OEMESON = "-Dui=disabled" -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" - -do_install:append() { - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d -} - FILES:${PN} += " \ ${libdir}/security/pam_malcontent.so \ ${datadir}/accountsservice \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc new file mode 100644 index 0000000000..09a3f675a6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc @@ -0,0 +1,268 @@ +# Autogenerated with 'bitbake -c update_crates deqp-runner' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.0.5 \ + crate://crates.io/android-tzdata/0.1.1 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/ansi_term/0.12.1 \ + crate://crates.io/anyhow/1.0.75 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitflags/2.4.0 \ + crate://crates.io/bumpalo/3.13.0 \ + crate://crates.io/cast/0.3.0 \ + crate://crates.io/cc/1.0.83 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.30 \ + crate://crates.io/clap/2.34.0 \ + crate://crates.io/core-foundation-sys/0.8.4 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/criterion/0.3.6 \ + crate://crates.io/criterion-plot/0.4.5 \ + crate://crates.io/crossbeam-channel/0.5.8 \ + crate://crates.io/crossbeam-deque/0.8.3 \ + crate://crates.io/crossbeam-epoch/0.9.15 \ + crate://crates.io/crossbeam-utils/0.8.16 \ + crate://crates.io/csv/1.2.2 \ + crate://crates.io/csv-core/0.1.10 \ + crate://crates.io/derive-getters/0.1.1 \ + crate://crates.io/either/1.9.0 \ + crate://crates.io/errno/0.3.3 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/fastrand/2.0.0 \ + crate://crates.io/flate2/1.0.27 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/half/1.8.2 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/heck/0.3.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.3.2 \ + crate://crates.io/iana-time-zone/0.1.57 \ + crate://crates.io/iana-time-zone-haiku/0.1.2 \ + crate://crates.io/indexmap/1.9.3 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/itoa/1.0.9 \ + crate://crates.io/js-sys/0.3.64 \ + crate://crates.io/junit-report/0.4.0 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.147 \ + crate://crates.io/linux-raw-sys/0.4.7 \ + crate://crates.io/log/0.4.20 \ + crate://crates.io/memchr/2.6.3 \ + crate://crates.io/memoffset/0.9.0 \ + crate://crates.io/miniz_oxide/0.7.1 \ + crate://crates.io/mio/0.8.8 \ + crate://crates.io/num-traits/0.2.16 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/once_cell/1.18.0 \ + crate://crates.io/oorandom/11.1.3 \ + crate://crates.io/plotters/0.3.5 \ + crate://crates.io/plotters-backend/0.3.5 \ + crate://crates.io/plotters-svg/0.3.5 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro2/1.0.66 \ + crate://crates.io/quote/1.0.33 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rayon/1.7.0 \ + crate://crates.io/rayon-core/1.11.0 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/regex/1.9.5 \ + crate://crates.io/regex-automata/0.3.8 \ + crate://crates.io/regex-syntax/0.7.5 \ + crate://crates.io/roxmltree/0.13.1 \ + crate://crates.io/rustix/0.38.13 \ + crate://crates.io/ryu/1.0.15 \ + crate://crates.io/same-file/1.0.6 \ + crate://crates.io/scopeguard/1.2.0 \ + crate://crates.io/serde/1.0.188 \ + crate://crates.io/serde-tuple-vec-map/1.0.1 \ + crate://crates.io/serde_cbor/0.11.2 \ + crate://crates.io/serde_derive/1.0.188 \ + crate://crates.io/serde_json/1.0.106 \ + crate://crates.io/serde_yaml/0.9.21 \ + crate://crates.io/stderrlog/0.5.4 \ + crate://crates.io/strsim/0.8.0 \ + crate://crates.io/structopt/0.3.26 \ + crate://crates.io/structopt-derive/0.4.18 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.32 \ + crate://crates.io/tempfile/3.8.0 \ + crate://crates.io/termcolor/1.1.3 \ + crate://crates.io/textwrap/0.11.0 \ + crate://crates.io/thiserror/1.0.48 \ + crate://crates.io/thiserror-impl/1.0.48 \ + crate://crates.io/thread_local/1.1.7 \ + crate://crates.io/tinytemplate/1.2.1 \ + crate://crates.io/toml/0.5.11 \ + crate://crates.io/unicode-ident/1.0.11 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/unsafe-libyaml/0.2.9 \ + crate://crates.io/vec_map/0.8.2 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/walkdir/2.4.0 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen/0.2.87 \ + crate://crates.io/wasm-bindgen-backend/0.2.87 \ + crate://crates.io/wasm-bindgen-macro/0.2.87 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.87 \ + crate://crates.io/wasm-bindgen-shared/0.2.87 \ + crate://crates.io/web-sys/0.3.64 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows/0.48.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.48.5 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ + crate://crates.io/windows_aarch64_msvc/0.48.5 \ + crate://crates.io/windows_i686_gnu/0.48.5 \ + crate://crates.io/windows_i686_msvc/0.48.5 \ + crate://crates.io/windows_x86_64_gnu/0.48.5 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ + crate://crates.io/windows_x86_64_msvc/0.48.5 \ + crate://crates.io/xml-rs/0.8.18 \ + crate://crates.io/xmlparser/0.13.5 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.0.5.sha256sum] = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +SRC_URI[anyhow-1.0.75.sha256sum] = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bitflags-2.4.0.sha256sum] = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[chrono-0.4.30.sha256sum] = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[criterion-0.3.6.sha256sum] = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +SRC_URI[criterion-plot-0.4.5.sha256sum] = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +SRC_URI[crossbeam-epoch-0.9.15.sha256sum] = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +SRC_URI[crossbeam-utils-0.8.16.sha256sum] = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +SRC_URI[csv-1.2.2.sha256sum] = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +SRC_URI[csv-core-0.1.10.sha256sum] = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +SRC_URI[derive-getters-0.1.1.sha256sum] = "16dc4e2517f08ca167440ccb11023c1308ee19a4022d7b03c0e652f971171869" +SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +SRC_URI[errno-0.3.3.sha256sum] = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[fastrand-2.0.0.sha256sum] = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +SRC_URI[flate2-1.0.27.sha256sum] = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[half-1.8.2.sha256sum] = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[heck-0.3.3.sha256sum] = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +SRC_URI[iana-time-zone-0.1.57.sha256sum] = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +SRC_URI[junit-report-0.4.0.sha256sum] = "e4e00ad2de771fc4988af88b02cbd618c08c17920208c35c4bbfe67ccfab31eb" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +SRC_URI[linux-raw-sys-0.4.7.sha256sum] = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +SRC_URI[mio-0.8.8.sha256sum] = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +SRC_URI[oorandom-11.1.3.sha256sum] = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +SRC_URI[plotters-0.3.5.sha256sum] = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +SRC_URI[plotters-backend-0.3.5.sha256sum] = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +SRC_URI[plotters-svg-0.3.5.sha256sum] = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[regex-1.9.5.sha256sum] = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +SRC_URI[regex-automata-0.3.8.sha256sum] = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +SRC_URI[regex-syntax-0.7.5.sha256sum] = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +SRC_URI[roxmltree-0.13.1.sha256sum] = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671" +SRC_URI[rustix-0.38.13.sha256sum] = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +SRC_URI[serde-1.0.188.sha256sum] = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +SRC_URI[serde-tuple-vec-map-1.0.1.sha256sum] = "a04d0ebe0de77d7d445bb729a895dcb0a288854b267ca85f030ce51cdc578c82" +SRC_URI[serde_cbor-0.11.2.sha256sum] = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +SRC_URI[serde_derive-1.0.188.sha256sum] = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +SRC_URI[serde_json-1.0.106.sha256sum] = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +SRC_URI[serde_yaml-0.9.21.sha256sum] = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +SRC_URI[stderrlog-0.5.4.sha256sum] = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" +SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +SRC_URI[structopt-0.3.26.sha256sum] = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +SRC_URI[structopt-derive-0.4.18.sha256sum] = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +SRC_URI[tempfile-3.8.0.sha256sum] = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +SRC_URI[thiserror-1.0.48.sha256sum] = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +SRC_URI[thiserror-impl-1.0.48.sha256sum] = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +SRC_URI[unicode-ident-1.0.11.sha256sum] = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[unsafe-libyaml-0.2.9.sha256sum] = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +SRC_URI[web-sys-0.3.64.sha256sum] = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-0.48.0.sha256sum] = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +SRC_URI[xml-rs-0.8.18.sha256sum] = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" +SRC_URI[xmlparser-0.13.5.sha256sum] = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch new file mode 100644 index 0000000000..e29b78fde3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch @@ -0,0 +1,172 @@ +From f453ec77fa9e6fd961a1f5f0b221260a5a21bba2 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Date: Tue, 27 Aug 2024 14:08:47 +0300 +Subject: [PATCH] deqp-runner: drop zstd support + +Building zstd-sys results in the "foo contains reference to TMPDIR" QA +error. Revert commit 1adddf3aa89f21b472d8046347ccdfa4612f141b to drop +zstd dependency. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +--- + Cargo.lock | 45 --------------------------------------------- + Cargo.toml | 3 --- + src/lib.rs | 31 +++++++------------------------ + 3 files changed, 7 insertions(+), 72 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 8443695e2bd5..50924576a8e3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -94,7 +94,6 @@ version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" + dependencies = [ +- "jobserver", + "libc", + ] + +@@ -271,7 +270,6 @@ dependencies = [ + "structopt", + "tempfile", + "toml", +- "zstd", + ] + + [[package]] +@@ -423,15 +421,6 @@ version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +-[[package]] +-name = "jobserver" +-version = "0.1.31" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +-dependencies = [ +- "libc", +-] +- + [[package]] + name = "js-sys" + version = "0.3.64" +@@ -544,12 +533,6 @@ version = "11.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +-[[package]] +-name = "pkg-config" +-version = "0.3.30" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +- + [[package]] + name = "plotters" + version = "0.3.5" +@@ -1217,31 +1200,3 @@ name = "xmlparser" + version = "0.13.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +- +-[[package]] +-name = "zstd" +-version = "0.13.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +-dependencies = [ +- "zstd-safe", +-] +- +-[[package]] +-name = "zstd-safe" +-version = "7.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +-dependencies = [ +- "zstd-sys", +-] +- +-[[package]] +-name = "zstd-sys" +-version = "2.0.11+zstd.1.5.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +-dependencies = [ +- "cc", +- "pkg-config", +-] +diff --git a/Cargo.toml b/Cargo.toml +index ac6295763e87..1fa1344a3105 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -120,9 +120,6 @@ version = "3.2" + [dependencies.toml] + version = "0.5" + +-[dependencies.zstd] +-version = "0.13.0" +- + [dev-dependencies.criterion] + version = "0.3.0" + +diff --git a/src/lib.rs b/src/lib.rs +index e7095267f1cd..ff7bc4f5d025 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -63,7 +63,6 @@ use rayon::prelude::*; + use regex::RegexSet; + use serde::Deserialize; + use std::collections::HashMap; +-use std::ffi::OsStr; + use std::fs::File; + use std::io::prelude::*; + use std::io::BufReader; +@@ -76,7 +75,6 @@ use std::time::Duration; + use std::time::Instant; + use structopt::StructOpt; + use timeout::{TimeoutChildExt, TimeoutChildStdout, Timer}; +-use zstd::stream::read::Decoder; + + fn parse_key_val<T, U>(s: &str) -> Result<(T, U), Box<dyn std::error::Error>> + where +@@ -1082,32 +1080,17 @@ pub fn read_lines<I: IntoIterator<Item = impl AsRef<Path>>>(files: I) -> Result< + let mut lines: Vec<String> = Vec::new(); + + for path in files { +- let mut path: &Path = path.as_ref(); +- let mut path_compressed: PathBuf = path.to_path_buf(); +- +- // always try append zst extension (and keep existing one, e.g. .txt) +- let ext = if let Some(file_ext) = path.extension().and_then(|ext| ext.to_str()) { +- format!("{}.zst", file_ext) +- } else { +- (".zst").to_string() +- }; +- +- path_compressed.set_extension(ext); +- if path_compressed.exists() { +- path = path_compressed.as_ref(); +- } +- let file = File::open(path).with_context(|| format!("opening path: {}", path.display()))?; +- let reader: Box<dyn Read> = match path.extension().and_then(OsStr::to_str) { +- Some("zst") => Box::new(Decoder::new(file).unwrap()), +- _ => Box::new(file), +- }; +- +- for line in BufReader::new(reader).lines() { ++ let path = path.as_ref(); ++ for line in BufReader::new( ++ File::open(path).with_context(|| format!("opening path: {}", path.display()))?, ++ ) ++ .lines() ++ { + let line = line.with_context(|| format!("reading line from {}", path.display()))?; + // In newer dEQP, vk-master.txt just contains a list of .txt + // caselist files relative to its current path, so recursively read + // thoseand append their contents. +- if line.ends_with(".txt") || line.ends_with(".txt.zst") { ++ if line.ends_with(".txt") { + let sub_path = path.parent().context("Getting path parent dir")?.join(line); + + lines.extend_from_slice( diff --git a/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb new file mode 100644 index 0000000000..04de074d24 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "A VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline." +HOMEPAGE = "https://gitlab.freedesktop.org/mesa/deqp-runner" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa\ +" + +inherit cargo cargo-update-recipe-crates + +SRC_URI += " \ + crate://crates.io/deqp-runner/0.20.0 \ + file://0001-deqp-runner-drop-zstd-support.patch \ +" + +SRC_URI[deqp-runner-0.20.0.sha256sum] = "a3f4fab1179a01cbbdbe4b93e0a040f74de7b9086498d91976d93844a31439dd" + +require deqp-runner-crates.inc diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc index 54aeb06aa9..59796cc65f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb.inc @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib sysfsutils" +DEPENDS = "jpeg libpng sysfsutils" SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ @@ -25,6 +25,7 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ file://0001-include-libgen.h-for-basename.patch \ file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ + file://0001-libdirect-remove-use-of-keyword-register.patch \ " S = "${WORKDIR}/DirectFB-${PV}" @@ -40,21 +41,21 @@ BINCONFIG = "${bindir}/directfb-config" inherit autotools binconfig-disabled pkgconfig -PACKAGECONFIG ??= "linuxinput" -PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" +PACKAGECONFIG ??= "freetype linuxinput zlib" PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" -PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype,freetype" +PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" +PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," -PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," +PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" +PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" EXTRA_OECONF = "\ --with-gfxdrivers=none \ - --enable-freetype=yes \ - --enable-zlib \ --disable-imlib2 \ --disable-sdl \ --disable-vnc \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch new file mode 100644 index 0000000000..24d977f4dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch @@ -0,0 +1,44 @@ +From f6cdb9f1c3dbef8ef695703a2a5fb4e92b2dd8a0 Mon Sep 17 00:00:00 2001 +From: Simon Barth <simon.barth@gmx.de> +Date: Mon, 5 Aug 2024 19:35:16 +0200 +Subject: [PATCH] libdirect: remove use of keyword 'register' + +The 'register' keyword was removed in C++17 and is now unused and +reserved. When compiling code that uses DirecthFB with C++17, +compilation fails. + +Since modern compilers likely don't produce different code whether the +'register' keyword is used or not, there shouldn't be any performance +impact introduced by this change. + +Signed-off-by: Simon Barth <simon.barth@gmx.de> + +Upstream-Status: Submitted [https://github.com/deniskropp/DirectFB/pull/25] +--- + lib/direct/util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/direct/util.h b/lib/direct/util.h +index 2109b6ca1..734645796 100644 +--- a/lib/direct/util.h ++++ b/lib/direct/util.h +@@ -220,7 +220,7 @@ void DIRECT_API direct_md5_sum( void *dst, const void *src, const int len ); + static __inline__ int + direct_util_count_bits( unsigned int mask ) + { +- register int ret = 0; ++ int ret = 0; + + while (mask) { + ret += mask & 1; +@@ -325,7 +325,7 @@ D_ICEIL(float f) + static __inline__ int + direct_log2( int val ) + { +- register int ret = 0; ++ int ret = 0; + + while (val >> ++ret); + +-- +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.3.bb index 2c38ce614b..5ab333c60d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/feh/feh_3.10.3.bb @@ -9,7 +9,7 @@ DEPENDS = "\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "5f94a77de25c5398876f0cf431612d782b842f4db154d2139b778c8f196e8969" +SRC_URI[sha256sum] = "5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb b/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb index 0adac8464e..7e07906e17 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20221101.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb @@ -7,7 +7,10 @@ LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz" -SRC_URI[sha256sum] = "5984fb5af3e4e1f927f3a74850b705a711fb86284802a5e6170b09786440e8be" +SRC_URI[sha256sum] = "1412a21b943c6e1db834ee2d74145aad20b3f62b12152d475613b8241d9cde10" + +UPSTREAM_CHECK_URI = "https://github.com/fontforge/libspiro/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+)" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch deleted file mode 100644 index 385bff8dd1..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 9 Feb 2019 08:28:09 -0800 -Subject: [PATCH] Explicit typecast to avoid implicit double to float - conversion - -fixes compile errors e.g. - -../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to - 'float' in initializer list [-Wc++11-narrowing] - (t3 + 2.0) / 3, 0.3 }; - ^~~~~~~~~~~~~~ -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - demo/simple.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/demo/simple.cpp b/demo/simple.cpp -index 532e862..aba55b4 100644 ---- a/demo/simple.cpp -+++ b/demo/simple.cpp -@@ -105,9 +105,9 @@ static void RenderScene(void) - float t2 = sin(n / 50 + 1); - float t3 = sin(n / 30 + 2); - -- float ambient[4] = { (t1 + 2.0) / 3, -- (t2 + 2.0) / 3, -- (t3 + 2.0) / 3, 0.3 }; -+ float ambient[4] = { float(t1 + 2.0) / 3, -+ float(t2 + 2.0) / 3, -+ float(t3 + 2.0) / 3, 0.3 }; - float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 }; - float specular[4] = { 1.0, 0.7, 0.7, 1.0 }; - float position[4] = { 100.0, 100.0, 0.0, 1.0 }; --- -2.20.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch new file mode 100644 index 0000000000..9c91b5be19 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch @@ -0,0 +1,33 @@ +From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Aug 2024 13:50:34 -0700 +Subject: [PATCH] Fix type mismatch with latest FreeType + +This change is intrumented due to a type change in freetype [1] with release 2.13.3 + +Fixes +| ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *' +| 171 | char* tagList = &outline.tags[startIndex]; +| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ + +[1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775 + +Upstream-Status: Submitted [https://github.com/HamzaM3/ftgl/pull/1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/FTVectoriser.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp +index 26e7da8..3610215 100644 +--- a/src/FTVectoriser.cpp ++++ b/src/FTVectoriser.cpp +@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ char* tagList = (char*)&outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1; diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch deleted file mode 100644 index e5ed0bdb86..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 23 Oct 2016 22:46:43 +0200 -Subject: [PATCH] use pkg-config to find freetype2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 53560ea..b5bb6a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) - - AC_PATH_X - --AC_CHECK_FT2([9.0.3],[], -- [AC_MSG_ERROR([FreeType2 is required to compile this library])]) -+PKG_CHECK_MODULES(FT2, freetype2, -+ CFLAGS="$CFLAGS $FT2_CFLAGS" -+ LIBS="$LIBS $FT2_LIBS", -+ AC_MSG_ERROR([FreeType2 is required to compile this library]) -+) -+AC_SUBST([FT2_CFLAGS]) -+AC_SUBST([FT2_LIBS]) - - AC_PATH_XTRA - --- -2.5.5 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch deleted file mode 100644 index 830783e204..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch +++ /dev/null @@ -1,38 +0,0 @@ -From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 23 Oct 2016 23:54:14 +0200 -Subject: [PATCH] Makefile.am: remove useless and breaking code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89a8a7f..e582a34 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,15 +24,6 @@ EXTRA_DIST = \ - m4 \ - $(NULL) - --# Print out an informative summary. --all-local: -- @$(ECHO) "Done." -- @$(ECHO) -- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ -- $(ECHO) "---" ;\ -- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ -- fi -- @$(ECHO) - - # Upload documentation - DOC = docs/html docs/latex/ftgl.pdf --- -2.5.5 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb deleted file mode 100644 index 65f72747cc..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "OpenGL frontend to Freetype 2" -HOMEPAGE = "https://sourceforge.net/projects/ftgl/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" - -inherit autotools pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opengl x11" - -DEPENDS += " \ - freetype \ - freeglut \ -" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-use-pkg-config-to-find-freetype2.patch \ - file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ - file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \ -" -SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" -SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" - -S = "${WORKDIR}/ftgl-2.1.3~rc5" - -# undefined reference to symbol 'sin@@GLIBC_2.4' -CFLAGS += "-lm" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb new file mode 100644 index 0000000000..4db453bc66 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "OpenGL frontend to Freetype 2" +HOMEPAGE = "https://sourceforge.net/projects/ftgl/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" + +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "opengl x11" + +DEPENDS += " \ + freetype \ + freeglut \ +" +SRCREV = "b787042cc1d1e4861337d5f9a6727e4c6900a4f2" +PV .= "+git" + +SRC_URI = "git://github.com/HamzaM3/ftgl;protocol=https;branch=master \ + file://0001-Fix-type-mismatch-with-latest-FreeType.patch" + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index df349494aa..fcf1bd9cae 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb @@ -72,6 +72,8 @@ EXTRA_OECONF = " \ --without-xpm-library \ ac_cv_func_mkstemp=no \ has_safety_mkstemp=yes \ + ac_cv_path_FVWM_CPP=cpp \ + ac_cv_path_PERL=perl \ " # show the exact commands in the log file @@ -90,6 +92,7 @@ do_install:append() { sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop + sed -i -e 's:${WORKDIR}::g' ${D}${bindir}/fvwm-bug } # the only needed packages (note: locale packages are automatically generated diff --git a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb index 513845194d..aba590aa02 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb @@ -19,3 +19,8 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ --without-cdk \ " +INSANE_SKIP:${PN} = "already-stripped" + +do_install:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${bindir}/gphoto2 +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 38d738310e..7548e976f1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -30,6 +30,9 @@ SRC_URI:append:class-nativesdk = "\ " SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" +UPSTREAM_CHECK_URI = "https://graphviz.org/download/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 30964a1b9a..a5c8de8f61 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -14,6 +14,9 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \ SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gtkperf/files/gtkperf/" +UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)" + DEPENDS = "gtk+" S = "${WORKDIR}/${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb index 0b1b054041..b7807c8853 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.119.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" -SRC_URI[sha256sum] = "eab3e09e7641115c07848bfb30f7dd0c3bbe2b8cbe45017e95e077dbba6ac038" +SRC_URI[sha256sum] = "5da94863fb2e5d88cc019e2bfdc676022398113894b585d864e11ca8341b24d8" S = "${WORKDIR}/${BPN}-gtk3-${PV}" DEPENDS = " \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index 87e7ed4a6b..8e5febd7a1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " PROVIDES = "virtual/imlib2" -PV = "1.12.2" -SRCREV = "a860e34b19af6b0a73d86ddc0e4829145e18fa6e" +PV = "1.12.3" +SRCREV = "143c60194c0948aac484d37bb23c59edea2ccf19" inherit autotools pkgconfig lib_package diff --git a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb index c0a2b45a48..89a35116c3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb @@ -4,9 +4,10 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f" UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" -SRC_URI[sha256sum] = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6" +SRC_URI[sha256sum] = "2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6" EXTRA_OECONF += " \ --without-libwebp \ diff --git a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb index 251c07adf0..db648ec8c2 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb @@ -24,3 +24,8 @@ DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" EXTRA_OECONF = "--with-extra-inc=${S}/lib" + +do_compile:append() { + sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps + sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb index ba928d281d..f9d3496d90 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb @@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4" SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libmng/files/libmng-devel/" +UPSTREAM_CHECK_REGEX = "libmng-devel/(?P<pver>\d+(\.\d+)+)" + inherit autotools-brokensep pkgconfig PACKAGECONFIG ??= "jpeg" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb index 666442fba2..4f702029d9 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084" DEPENDS = "libsdl" SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" -SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16" -SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0" +SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c630f419" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/" S = "${WORKDIR}/SDL_gfx-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch deleted file mode 100644 index b29e5dc7b2..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses/0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch +++ /dev/null @@ -1,176 +0,0 @@ -From b81fb7942ab77b0bf6791e5fd98411dd68f133d9 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 18 Dec 2022 15:13:00 -0800 -Subject: [PATCH] libyui-ncurses: Replace off64_t with off_t and stat64 with stat - -stat is same as stat64 when 64bit off_t is used. - -Upstream-Status: Submitted [https://github.com/libyui/libyui/pull/88] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 2 +- - src/NCAskForFile.cc | 6 +++--- - src/NCFileSelection.cc | 24 ++++++++++++------------ - src/NCFileSelection.h | 6 +++--- - 4 files changed, 19 insertions(+), 19 deletions(-) - -diff --git a/CMakeLists.txt b/libyui-ncurses/CMakeLists.txt -index b10eab8e..2000bb58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,7 @@ set( CMAKE_INSTALL_MESSAGE LAZY ) # Suppress "up-to-date" messages during "make - # Initialize compiler flags for all targets in all subdirectories - add_compile_options( "-Wall" ) - add_compile_options( "-Os" ) # Optimize for size (overrides CMake's -O3 in RELEASE builds) -- -+add_compile_options( "-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ) # Enable largefile support - if ( WERROR ) - add_compile_options( "-Werror" ) - endif() -diff --git a/src/NCAskForFile.cc b/libyui-ncurses/src/NCAskForFile.cc -index aba6e0a6..44bb81bc 100644 ---- a/src/NCAskForFile.cc -+++ b/src/NCAskForFile.cc -@@ -73,8 +73,8 @@ std::string NCAskForFile::checkIniDir( std::string iniDir ) - { - std::string dname = ""; - -- struct stat64 statInfo; -- stat64( iniDir.c_str(), &statInfo ); -+ struct stat statInfo; -+ stat( iniDir.c_str(), &statInfo ); - - if ( S_ISDIR( statInfo.st_mode ) ) - { -@@ -90,7 +90,7 @@ std::string NCAskForFile::checkIniDir( std::string iniDir ) - && pos != 0 ) - { - std::string dir = iniDir.substr( 0, pos ); -- stat64( dir.c_str(), &statInfo ); -+ stat( dir.c_str(), &statInfo ); - - if ( S_ISDIR( statInfo.st_mode ) ) - { -diff --git a/src/NCFileSelection.cc b/libyui-ncurses/src/NCFileSelection.cc -index 3eb9c908..8894dc72 100644 ---- a/src/NCFileSelection.cc -+++ b/src/NCFileSelection.cc -@@ -46,7 +46,7 @@ using std::list; - - - NCFileInfo::NCFileInfo( string fileName, -- struct stat64 * statInfo, -+ struct stat * statInfo, - bool link ) - { - _name = fileName; -@@ -146,7 +146,7 @@ NCFileInfo::NCFileInfo() - _mode = ( mode_t )0; - _device = ( dev_t )0; - _links = ( nlink_t )0; -- _size = ( off64_t )0; -+ _size = ( off_t )0; - _mtime = ( time_t )0; - } - -@@ -177,11 +177,11 @@ NCFileSelection::NCFileSelection( YWidget * parent, - { - SetSepChar( ' ' ); - -- struct stat64 statInfo; -+ struct stat statInfo; - - if ( !iniDir.empty() ) - { -- stat64( iniDir.c_str(), &statInfo ); -+ stat( iniDir.c_str(), &statInfo ); - } - - if ( iniDir.empty() -@@ -559,8 +559,8 @@ NCursesEvent NCFileTable::wHandleInput( wint_t key ) - bool NCFileTable::fillList() - { - -- struct stat64 statInfo; -- struct stat64 linkInfo; -+ struct stat statInfo; -+ struct stat linkInfo; - struct dirent * entry; - list<string> tmpList; - list<string>::iterator it; -@@ -592,7 +592,7 @@ bool NCFileTable::fillList() - { - string fullName = currentDir + "/" + ( *it ); - -- if ( lstat64( fullName.c_str(), &statInfo ) == 0 ) -+ if ( lstat( fullName.c_str(), &statInfo ) == 0 ) - { - if ( S_ISREG( statInfo.st_mode ) || S_ISBLK( statInfo.st_mode ) ) - { -@@ -604,7 +604,7 @@ bool NCFileTable::fillList() - } - else if ( S_ISLNK( statInfo.st_mode ) ) - { -- if ( stat64( fullName.c_str(), &linkInfo ) == 0 ) -+ if ( stat( fullName.c_str(), &linkInfo ) == 0 ) - { - if ( S_ISREG( linkInfo.st_mode ) || S_ISBLK( linkInfo.st_mode ) ) - { -@@ -701,8 +701,8 @@ void NCDirectoryTable::fillHeader() - - bool NCDirectoryTable::fillList() - { -- struct stat64 statInfo; -- struct stat64 linkInfo; -+ struct stat statInfo; -+ struct stat linkInfo; - struct dirent * entry; - list<string> tmpList; - list<string>::iterator it; -@@ -734,7 +734,7 @@ bool NCDirectoryTable::fillList() - { - string fullName = currentDir + "/" + ( *it ); - -- if ( lstat64( fullName.c_str(), &statInfo ) == 0 ) -+ if ( lstat( fullName.c_str(), &statInfo ) == 0 ) - { - if ( S_ISDIR( statInfo.st_mode ) ) - { -@@ -746,7 +746,7 @@ bool NCDirectoryTable::fillList() - } - else if ( S_ISLNK( statInfo.st_mode ) ) - { -- if ( stat64( fullName.c_str(), &linkInfo ) == 0 ) -+ if ( stat( fullName.c_str(), &linkInfo ) == 0 ) - { - if ( S_ISDIR( linkInfo.st_mode ) ) - { -diff --git a/src/NCFileSelection.h b/libyui-ncurses/src/NCFileSelection.h -index 0569215d..5c459d62 100644 ---- a/src/NCFileSelection.h -+++ b/src/NCFileSelection.h -@@ -44,10 +44,10 @@ - struct NCFileInfo - { - /** -- * Constructor from a stat buffer (i.e. based on an lstat64() call). -+ * Constructor from a stat buffer (i.e. based on an lstat() call). - **/ - NCFileInfo( std::string fileName, -- struct stat64 * statInfo, -+ struct stat * statInfo, - bool link = false ); - - NCFileInfo(); -@@ -65,7 +65,7 @@ struct NCFileInfo - dev_t _device; // device this object resides on - mode_t _mode; // file permissions + object type - nlink_t _links; // number of links -- off64_t _size; // size in bytes -+ off_t _size; // size in bytes - time_t _mtime; // modification time - - bool isDir() { return (( S_ISDIR( _mode ) ) ? true : false ); } --- -2.39.0 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb index bcc5ef33e2..4196449f3a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb @@ -5,12 +5,11 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 " SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ - file://0001-libyui-ncurses-Replace-off64_t-with-off_t-and-stat64.patch \ " SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac" +SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" S = "${WORKDIR}/git/libyui-ncurses" @@ -20,9 +19,16 @@ DEPENDS += "boost libyui ncurses" BBCLASSEXTEND = "nativesdk" -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCMAKE_SKIP_RPATH=1" + +# TODO: Check with newer GCC, it works ok with GCC +# GCC-14 causes buildpaths QA error +# WARNING: libyui-ncurses-4.6.2-r0 do_package_qa: QA Issue: File /usr/lib/yui/.debug/libyui-ncurses.so.16.0.0 in package libyui-ncurses-dbg contains reference to TMPDIR [buildpaths + +DEBUG_LEVELFLAG = "" CXXFLAGS += "-DNCURSES_WIDECHAR" +LDFLAGS += "-L${B}/src" do_configure:prepend () { cd ${S} diff --git a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb index 939f3f36e5..419a9522a4 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ file://0001-Use-relative-install-paths-for-CMake.patch \ " -SRCREV = "dabdcd9cc6a0058fd6966d7d2e19d508debcc0ac" +SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" S = "${WORKDIR}/git/libyui" @@ -20,6 +20,7 @@ DEPENDS += "boost" EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" +LDFLAGS += "-L${B}/src" BBCLASSEXTEND = "native nativesdk" do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch index bd619b1572..0bfc3f3e79 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch @@ -10,7 +10,7 @@ the case, e.g. the lv_demo_fb uses encoded images which are of type LV_IMAGE_SRC_VARIABLE and instead of filename, come with a buffer of pixels. Handle the later using SDL_CreateRGBSurfaceFrom(). -Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5852] +Upstream-Status: Backport [b339e67581864b2fb6bb8897735a1e110c324ddc] Signed-off-by: Marek Vasut <marex@denx.de> --- src/draw/sdl/lv_draw_sdl.c | 30 +++++++++++++++++++++++++++--- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch index 73c01cb590..7e542bcfbc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch @@ -9,7 +9,7 @@ case it is, use it as the video card file in lv_linux_fbdev_set_file(). Otherwise fall back to /dev/fb0, i.e. the current behavior. This way, it is possible to test LVGL on systems with multiple fbdev devices. -Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] Signed-off-by: Marek Vasut <marex@denx.de> --- main.c | 8 +++++++- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch index d24d150c06..6843af0aab 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch @@ -8,7 +8,7 @@ around it, so it can be conditionally compiled in. This is done in preparation for addition of other backend initialization example code. -Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] Signed-off-by: Marek Vasut <marex@denx.de> --- main.c | 18 ++++++++++++++---- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch index 9ee7a7f19d..2d2c4c60f1 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch @@ -13,7 +13,7 @@ To use DRM/KMS support, adjust lv_conf.h as follows: LV_USE_LINUX_FBDEV=0 LV_USE_LINUX_DRM=1 -Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] Signed-off-by: Marek Vasut <marex@denx.de> --- CMakeLists.txt | 5 ++++- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch index 691ee80b59..cfb6c6e817 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch @@ -22,7 +22,7 @@ LV_USE_LINUX_FBDEV=0 LV_USE_LINUX_DRM=0 LV_USE_SDL=1 -Upstream-Status: Submitted [https://github.com/lvgl/lv_port_linux_frame_buffer/pull/47] +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] Signed-off-by: Marek Vasut <marex@denx.de> --- CMakeLists.txt | 6 +++++- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch index 6997d84153..f5d39396fc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch @@ -7,10 +7,10 @@ Add missing version suffix to shared libraries. Currently the filename of generated shared libraries is only liblvgl.so, which prevents coexistence of different versions of LVGL on the same system. Set VERSION and SOVERSION to make cmake add the version suffix to generated shared libraries. That -changes the filename to liblvgl.so.9.0.0 and includes symlink with major +changes the filename to liblvgl.so.9.1.0 and includes symlink with major ABI version, i.e. liblvgl.so.9 . -Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/5865] +Upstream-Status: Backport [2c469279f53f9dee63d71295c6058749bc87ce73] Signed-off-by: Marek Vasut <marex@denx.de> --- env_support/cmake/custom.cmake | 11 +++++++++++ @@ -21,7 +21,7 @@ index 9800468eb..6f33f1cc8 100644 --- a/env_support/cmake/custom.cmake +++ b/env_support/cmake/custom.cmake @@ -1,3 +1,6 @@ -+set(LVGL_VERSION "9.0.0") ++set(LVGL_VERSION "9.1.0") +set(LVGL_SOVERSION "9") + # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch index 449db53dfb..5cafb41d56 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch @@ -6,7 +6,7 @@ Subject: [PATCH] fix(fbdev): set resolution prior to buffer Otherwise it ends up with using the default value 800x480 and may fail at lv_display_set_buffers due to incorrect resolution. -Upstream-Status: Submitted [https://github.com/lvgl/lvgl/pull/6004] +Upstream-Status: Backport [29662d1c357c15135d076a2a924b9ef056c82120] Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com> --- diff --git a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb index 4435c40777..63c810d74d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb @@ -24,10 +24,5 @@ S = "${WORKDIR}/git" require lv-conf.inc do_install:append() { - install -d "${D}${includedir}/${PN}" - install -m 0644 "${S}/lv_conf.h" "${D}${includedir}/${PN}/lv_conf.h" + install -m 0644 "${S}/lv_conf.h" "${D}${includedir}/${BPN}/lv_conf.h" } - -FILES:${PN}-dev += "\ - ${includedir}/${PN}/ \ - " diff --git a/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb index c9c4a6c27a..9065050c62 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb @@ -4,9 +4,9 @@ HOMEPAGE = "https://github.com/any1/neatvnc" LICENSE = "ISC" LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" -SRC_URI = "git://github.com/any1/neatvnc;branch=master;protocol=https" +SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https" -SRCREV = "46432ce8cade0b54a38d4bb42eb07f96c8ff49fd" +SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch b/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch new file mode 100644 index 0000000000..8bc2b80f68 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch @@ -0,0 +1,56 @@ +From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001 +From: pldubouilh <pldubouilh@gmail.com> +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. + +Upstream-Status: Backport [http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72] +Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr> +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b240..b8264587 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 9a15077316..50231602dc 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -8,11 +8,15 @@ SRC_URI = " \ http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ file://0001-openbox-xdg-autostart-convert-to-python3.patch \ + file://0001-Fix-list-traversal-issue-in-client_calc_layer.patch \ " SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" +UPSTREAM_CHECK_URI = "https://github.com/Mikachu/openbox/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + inherit autotools gettext update-alternatives pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch index 0ba13cf88f..2e25ecc7ef 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch @@ -1,4 +1,4 @@ -From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 +From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Fri, 28 Sep 2018 00:38:50 +0200 Subject: [PATCH] Do not ask cmake to export binaries - they don't make it @@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 4324c36d..2c11fe02 100644 +index 26156bcb..9eff04aa 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt -@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) +@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) endif() # Install exe install(TARGETS ${exe} - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) if(OPJ_USE_DSYMUTIL) -- -2.14.4 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb index f2d74078e8..45f1b5ef42 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ - file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ " -SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" +SRCREV = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae" S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch new file mode 100644 index 0000000000..1c714f84dc --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch @@ -0,0 +1,43 @@ +From 4eb26927eebebfc4df8789ba69f60f3c28b8ba33 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Jul 2024 23:36:23 -0700 +Subject: [PATCH] jpeg-compressor: Reorder stdio.h include location + +Current, location ends up with compile errors with clang and glibc 2.40 +fortified headers + +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:13: error: use of undeclared identifier '__builtin___vfprintf_chk'; did you mean '__builtin___sprintf_chk'? +| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:39: error: cannot initialize a parameter of type 'char *' with an lvalue of type 'FILE *const __restrict' (aka 'jpge::_IO_FILE *const __restrict') +| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, +| | ^~~~~~~~ + +This re-ordering ensures that fortified function prototypes are used correctly. + +Upstream-Status: Submitted [https://github.com/baldurk/renderdoc/pull/3369] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + renderdoc/3rdparty/jpeg-compressor/jpge.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp +index 74d9d1006..d58e41664 100644 +--- a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp ++++ b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp +@@ -10,6 +10,7 @@ + + #include "jpge.h" + ++#include <stdio.h> + #include <stdlib.h> + #include <string.h> + +@@ -897,7 +898,6 @@ bool jpeg_encoder::process_scanline(const void* pScanline) + } + + // Higher level wrappers/examples (optional). +-#include <stdio.h> + + class cfile_stream : public output_stream + { diff --git a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb index 58f2275736..833845b5a3 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.27.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb @@ -2,11 +2,12 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=36d34a46cb71546195d2b0c626a52e5d" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5536c2b72eeed14bafaf4d2a6c032b87" -SRCREV = "35b13a8e8fd2a331854dba6da81a20452e142d6f" +SRCREV = "cae289323847ce0a84a0deca4958183567eee17e" SRC_URI = " \ git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ + file://0001-jpeg-compressor-Reorder-stdio.h-include-location.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb index 161650f75d..f2ffee64fe 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb @@ -11,6 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef" SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c" +UPSTREAM_CHECK_REGEX = "files/v(?P<pver>\d+(\.\d+)+)" + inherit autotools features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb index b32bf34518..1177e34cdf 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.3.4.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb @@ -5,7 +5,7 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "8ee020e14cf5be4e3f0e9beb09b6b050a1871854" +SRCREV = "b5f279ec7582dc57f6464557ed938558791f200d" SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb index e7ec004059..15449b216a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb @@ -14,6 +14,9 @@ SRC_URI = " \ SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e" S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" +UPSTREAM_CHECK_URI = "https://github.com/adobe-fonts/source-code-pro/tags" +UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+\.\d+)R" + do_install() { install -d ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb index bce37a2e05..1253cf8834 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb @@ -3,13 +3,15 @@ require ttf.inc SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" HOMEPAGE = "http://software.sil.org/abyssinica/" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.txt;md5=fd664aaab50445c3c1c97544554a6bda" +LIC_FILES_CHKSUM = "file://OFL.txt;md5=347eaa34fdf555aaf6b2144a5ccca45b" SRCNAME = "AbyssinicaSIL" SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[sha256sum] = "1a1fc8e82f0c0f2e824f42bff05c1f4a0356330a89dc7ba798c1a20bc3e333e0" +UPSTREAM_CHECK_URI = "https://software.sil.org/abyssinica/download/" + +SRC_URI[sha256sum] = "961259a1d9ace083f737eb1e55cec40c9a56f4855866d7474bf212d2a4366ab8" FONT_PACKAGES = "${PN}" FILES:${PN} = "${datadir}" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 5a8fe4c320..43b4614f0b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5 SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ file://OFL.txt" -S = "${UNPACKDIR}/ttf-inconsolata-${PV}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb index d118769cc8..0c29a20cdd 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb @@ -13,6 +13,9 @@ SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip" SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32" SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf" +UPSTREAM_CHECK_URI = "https://repology.org/project/fonts:ubuntu/packages" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/ubuntu-font-family-${PV}" PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb index 21897a7589..e2925b6c95 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb @@ -9,6 +9,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}.tar.gz" SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd" SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wqy/files/wqy-zenhei/" +UPSTREAM_CHECK_REGEX = "wqy-zenhei/(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/wqy-zenhei" do_install:append () { diff --git a/meta-openembedded/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-openembedded/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb new file mode 100644 index 0000000000..3f44e537a4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Tool to query the capabilities of a VDPAU implementation" +HOMEPAGE = "https://gitlab.freedesktop.org/vdpau/vdpauinfo" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c" + +DEPENDS = "libvdpau" + +# libvdpau is available only with x11 +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS:${PN} = "libvdpau" + +SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28" +SRC_URI = "git://anongit.freedesktop.org/vdpau/vdpauinfo;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch index f659e36066..9eef9a702e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch @@ -15,15 +15,15 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/framework/platform/CMakeLists.txt +++ b/framework/platform/CMakeLists.txt -@@ -73,8 +73,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) - add_definitions(-DDEQP_SUPPORT_WAYLAND=1) - include_directories(lnx/wayland) - -- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) +@@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) + configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) + configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) + else () +- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) - -+ if (NOT WAYLAND_PROTOCOLS_DIR) -+ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) -+ endif() - if (NOT WAYLAND_SCANNER) - pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) - endif() ++ if (NOT WAYLAND_PROTOCOL_DIR) ++ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) ++ endif() + if (NOT WAYLAND_SCANNER) + pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + endif() diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch new file mode 100644 index 0000000000..774b7aefee --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch @@ -0,0 +1,123 @@ +From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 +From: Trevor Woerner <twoerner@gmail.com> +Date: Thu, 23 Sep 2021 19:36:43 -0400 +Subject: [PATCH] use library sonames for linking + +The recommended "best practices" for applications is to link to library +sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This +ensures that applications don't try to use libraries if an incompatible ABI +change occurs. + +Upstream-Status: Denied [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] +Signed-off-by: Trevor Woerner <twoerner@gmail.com> +--- + framework/egl/egluGLContextFactory.cpp | 4 ++-- + framework/egl/wrapper/eglwLibrary.cpp | 2 +- + framework/platform/android/tcuAndroidPlatform.cpp | 2 +- + framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- + .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- + framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- + 6 files changed, 9 insertions(+), 9 deletions(-) + +--- a/framework/egl/egluGLContextFactory.cpp ++++ b/framework/egl/egluGLContextFactory.cpp +@@ -63,7 +63,7 @@ using std::vector; + #if (DE_OS == DE_OS_WIN32) + #define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" + #else +-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + #endif + #endif + +@@ -75,7 +75,7 @@ using std::vector; + #if (DE_OS == DE_OS_WIN32) + #define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" + #else +-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + #endif + #endif + +--- a/framework/egl/wrapper/eglwLibrary.cpp ++++ b/framework/egl/wrapper/eglwLibrary.cpp +@@ -145,7 +145,7 @@ DefaultLibrary::~DefaultLibrary(void) + const char *DefaultLibrary::getLibraryFileName(void) + { + #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) +- return "libEGL.so"; ++ return "libEGL.so.1"; + #elif (DE_OS == DE_OS_WIN32) + return "libEGL.dll"; + #else +--- a/framework/platform/android/tcuAndroidPlatform.cpp ++++ b/framework/platform/android/tcuAndroidPlatform.cpp +@@ -56,7 +56,7 @@ static const eglu::NativeWindow::Capabil + class NativeDisplay : public eglu::NativeDisplay + { + public: +- NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") ++ NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") + { + } + virtual ~NativeDisplay(void) +@@ -223,7 +223,7 @@ class VulkanLibrary : public vk::Library + { + public: + VulkanLibrary(const char *libraryPath) +- : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so") ++ : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so.1") + , m_driver(m_library) + { + } +--- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp ++++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +@@ -77,7 +77,7 @@ using tcu::TextureLevel; + class Library : public eglw::DefaultLibrary + { + public: +- Library(void) : eglw::DefaultLibrary("libEGL.so") ++ Library(void) : eglw::DefaultLibrary("libEGL.so.1") + { + } + +--- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp ++++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +@@ -64,7 +64,7 @@ public: + Display(MovePtr<wayland::Display> waylandDisplay) + : NativeDisplay(CAPABILITIES, EGL_PLATFORM_WAYLAND_KHR, "EGL_KHR_platform_wayland") + , m_display(waylandDisplay) +- , m_library("libEGL.so") ++ , m_library("libEGL.so.1") + { + } + +--- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp ++++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +@@ -69,7 +69,7 @@ using std::vector; + + // Default library names + #if !defined(DEQP_GLES2_LIBRARY_PATH) +-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + #endif + + #if !defined(DEQP_GLES3_LIBRARY_PATH) +@@ -77,7 +77,7 @@ using std::vector; + #endif + + #if !defined(DEQP_OPENGL_LIBRARY_PATH) +-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + #endif + + #if !defined(DEQP_VULKAN_LIBRARY_PATH) +@@ -258,7 +258,7 @@ glu::RenderContext *ContextFactory::crea + + EglRenderContext::EglRenderContext(const glu::RenderConfig &config, const tcu::CommandLine &cmdLine, + const glu::RenderContext *sharedContext) +- : m_egl("libEGL.so") ++ : m_egl("libEGL.so.1") + , m_contextType(config.type) + , m_eglDisplay(EGL_NO_DISPLAY) + , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch deleted file mode 100644 index 0dd59713a1..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkan-cts-include-missing-cstdint.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b07f6ecd6ab83b788301a555dc546b9a5c9dd8a2 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Wed, 25 Jan 2023 19:19:34 -0800 -Subject: [PATCH] Include missing <cstdint> - -This error is seen with gcc-13 where include headers are not implicitly -included [1] - -Fixes errors e.g. -error: 'uint32_t' does not name a type - -[1] https://www.gnu.org/software/gcc/gcc-13/porting_to.html - -Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - framework/common/tcuDefs.hpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/framework/common/tcuDefs.hpp b/framework/common/tcuDefs.hpp -index ad3d0736d..6dfac10fb 100644 ---- a/framework/common/tcuDefs.hpp -+++ b/framework/common/tcuDefs.hpp -@@ -26,6 +26,7 @@ - #include "deDefs.hpp" - #include "qpTestLog.h" - -+#include <cstdint> - #include <string> - #include <stdexcept> - --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch deleted file mode 100644 index 40aea8f203..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts-Include-missing-cstdint.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1b7646ced0f0b969f818084887885827ed1a4244 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: Include missing <cstdint> - -Fixes build with gcc-13 - -../git/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp:2798:102: error: 'uintptr_t' in namespace 'std' does not name a type - 2798 | BufferDataType type = static_cast<BufferDataType>(reinterpret_cast<std::uintptr_t>(expectedOutputs[resultIndex].getUserData())); - | ^~~~~~~~~ - -Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/378] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index ab02be1dc..3d3ee4829 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -33,6 +33,7 @@ - #include "deFloat16.h" - #include "vkQueryUtil.hpp" - #include "vkRefUtil.hpp" -+#include <cstdint> - #include <cstring> - #include <vector> - #include <limits> --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index 4ecc371ca4..af59dd3e61 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -2,7 +2,7 @@ Upstream-Status: Pending --- a/external/glslang/src/glslang/Include/PoolAlloc.h +++ b/external/glslang/src/glslang/Include/PoolAlloc.h -@@ -240,8 +240,9 @@ protected: +@@ -245,8 +245,9 @@ protected: int numCalls; // just an interesting statistic size_t totalBytes; // just an interesting statistic diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 58dc1f24dd..717d489786 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -2,9 +2,9 @@ Upstream-Status: Pending --- a/framework/delibs/dethread/CMakeLists.txt +++ b/framework/delibs/dethread/CMakeLists.txt -@@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) +@@ -41,6 +41,7 @@ if (DE_OS_IS_UNIX) + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") add_definitions(-D__BSD_VISIBLE) - add_definitions(-D_XOPEN_SOURCE=600) endif () + add_definitions(-D_XOPEN_SOURCE=600) add_definitions(-D_GNU_SOURCE) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch deleted file mode 100644 index 8a8d8d2c32..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/files/gen-framework-path.patch +++ /dev/null @@ -1,20 +0,0 @@ -Prepend instead of append to the module search path, as this script needs to use -the local module build, not the host module build. - -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@arm.com> - -diff --git a/external/vulkancts/scripts/gen_framework.py b/external/vulkancts/scripts/gen_framework.py -index 83c5329ce..10e720910 100755 ---- a/external/vulkancts/scripts/gen_framework.py -+++ b/external/vulkancts/scripts/gen_framework.py -@@ -33 +33 @@ from collections import OrderedDict --sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) -+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) -diff --git a/external/vulkancts/scripts/gen_framework_c.py b/external/vulkancts/scripts/gen_framework_c.py -index 95587e642..84b878cb2 100644 ---- a/external/vulkancts/scripts/gen_framework_c.py -+++ b/external/vulkancts/scripts/gen_framework_c.py -@@ -28 +28 @@ import re --sys.path.append(os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) -+sys.path.insert(0, os.path.join(os.path.dirname(__file__), "..", "..", "..", "scripts")) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 09f1fbcaee..0322ef453a 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -3,20 +3,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ - git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ - git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=main \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=main \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=main \ - git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;branch=master \ - git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;branch=main \ - https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ - git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;branch=main \ - git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ + git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;nobranch=1 \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;nobranch=1 \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;nobranch=1 \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;nobranch=1 \ + git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;nobranch=1 \ + git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;nobranch=1 \ + git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;destsuffix=git/external/vulkan-validationlayers/src;name=vulkan-validationlayers;nobranch=1 \ + git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;nobranch=1 \ + git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ + https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ " -S = "${WORKDIR}/git" - -SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_vulkan-docs" +SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video-parser_vulkan-docs_vulkan-validationlayers" S = "${WORKDIR}/git" @@ -27,7 +26,7 @@ ANY_OF_DISTRO_FEATURES += "opengl vulkan" DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" SRC_URI += " \ - file://0001-vulkancts-Include-missing-cstdint.patch \ + file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-use-library-sonames-for-linking.patch \ " @@ -39,7 +38,7 @@ DEPENDS:append:libc-musl = " libexecinfo" SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " - +EXTRA_OECMAKE += "-DUPDATE_DEPS=OFF" EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" # The best thing for the user to do is to not specify any of the following @@ -81,3 +80,11 @@ python __anonymous() { CTSDIR = "/usr/lib/${BPN}" FILES:${PN} += "${CTSDIR}" + +# does not work with libc++-19 due +# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>' +TOOLCHAIN = "gcc" + +# Validation-layers requires access during configure as it fetches validation-headers +# and bunch of other packages from khronos github +do_configure[network] = "1" diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index b5a1d331ed..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null @@ -1,114 +0,0 @@ -From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner <twoerner@gmail.com> -Date: Thu, 23 Sep 2021 19:36:43 -0400 -Subject: [PATCH] use library sonames for linking - -The recommended "best practices" for applications is to link to library -sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This -ensures that applications don't try to use libraries if an incompatible ABI -change occurs. - -Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] -Signed-off-by: Trevor Woerner <twoerner@gmail.com> ---- - framework/egl/egluGLContextFactory.cpp | 4 ++-- - framework/egl/wrapper/eglwLibrary.cpp | 2 +- - framework/platform/android/tcuAndroidPlatform.cpp | 2 +- - framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- - .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- - framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- - 6 files changed, 9 insertions(+), 9 deletions(-) - ---- a/framework/egl/egluGLContextFactory.cpp -+++ b/framework/egl/egluGLContextFactory.cpp -@@ -63,7 +63,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" - # else --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" - # endif - #endif - -@@ -75,7 +75,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" - # else --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" - # endif - #endif - ---- a/framework/egl/wrapper/eglwLibrary.cpp -+++ b/framework/egl/wrapper/eglwLibrary.cpp -@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) - const char* DefaultLibrary::getLibraryFileName (void) - { - #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) -- return "libEGL.so"; -+ return "libEGL.so.1"; - #elif (DE_OS == DE_OS_WIN32) - return "libEGL.dll"; - #else ---- a/framework/platform/android/tcuAndroidPlatform.cpp -+++ b/framework/platform/android/tcuAndroidPlatform.cpp -@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil - class NativeDisplay : public eglu::NativeDisplay - { - public: -- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} -+ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} - virtual ~NativeDisplay (void) {} - - virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } ---- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr - { - public: - Library (void) -- : eglw::DefaultLibrary("libEGL.so") -+ : eglw::DefaultLibrary("libEGL.so.1") - { - } - ---- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -+++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -@@ -66,7 +66,7 @@ public: - EGL_PLATFORM_WAYLAND_KHR, - "EGL_KHR_platform_wayland") - , m_display (waylandDisplay) -- , m_library ("libEGL.so") {} -+ , m_library ("libEGL.so.1") {} - - ~Display(void) {} - wayland::Display& getWaylandDisplay (void) { return *m_display; } ---- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -@@ -69,7 +69,7 @@ using std::vector; - - // Default library names - #if !defined(DEQP_GLES2_LIBRARY_PATH) --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" - #endif - - #if !defined(DEQP_GLES3_LIBRARY_PATH) -@@ -77,7 +77,7 @@ using std::vector; - #endif - - #if !defined(DEQP_OPENGL_LIBRARY_PATH) --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" - #endif - - #if !defined(DEQP_VULKAN_LIBRARY_PATH) -@@ -234,7 +234,7 @@ glu::RenderContext* ContextFactory::crea - } - - EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) -- : m_egl("libEGL.so") -+ : m_egl("libEGL.so.1") - , m_contextType(config.type) - , m_eglDisplay(EGL_NO_DISPLAY) - , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb index 0656d724b4..7dd60dffd8 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.9.3.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb @@ -1,25 +1,20 @@ DESCRIPTION = "OpenGL CTS" require khronos-cts.inc -# opengl-es-cts-3.2.9.3 -SRCREV_vk-gl-cts = "7f5fb62245d535a1fc0bf50b2c7e5a342dc551fe" -SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" -SRCREV_glslang = "a0ad0d7067521fff880e36acfb8ce453421c3f25" -SRCREV_spirv-headers = "87d5b782bec60822aa878941e6b13c0a9a954c9b" -SRCREV_spirv-tools = "f98473ceeb1d33700d01e20910433583e5256030" +# opengl-es-cts-3.2.11.0 +SRCREV_vk-gl-cts = "66956d195169596472e956e3aebf2df8e3bd960d" +SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" +SRCREV_glslang = "4da479aa6afa43e5a2ce4c4148c572a03123faf3" +SRCREV_spirv-headers = "ff2afc3afc48dff4eec2a10f0212402a80708e38" +SRCREV_spirv-tools = "148c97f6876e427efd76d2328122c3075eab4b8f" SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" # Not yet needed SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" -SRCREV_vulkan-docs = "9a2e576a052a1e65a5d41b593e693ff02745604b" -SRCREV_video-parser = "7d68747d3524842afaf050c5e00a10f5b8c07904" +SRCREV_vulkan-docs = "ed4ba0242beb89a1795d6084709fa9e713559c94" +SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" +SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -SRC_URI += "\ - git://github.com/nvpro-samples/vk_video_samples.git;protocol=https;destsuffix=git/external/video-parser/src;name=video-parser;branch=main \ - file://gen-framework-path.patch \ - " -S = "${WORKDIR}/git" - do_install() { install -d ${D}/${CTSDIR} cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} @@ -37,4 +32,3 @@ do_install() { SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" LTO = "" - diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch deleted file mode 100644 index f12abd0c1a..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts/0001-use-library-sonames-for-linking.patch +++ /dev/null @@ -1,114 +0,0 @@ -From acd25c4b8d5b7e420a7a89bdfd6551c70de828b3 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner <twoerner@gmail.com> -Date: Thu, 23 Sep 2021 19:36:43 -0400 -Subject: [PATCH] use library sonames for linking - -The recommended "best practices" for applications is to link to library -sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This -ensures that applications don't try to use libraries if an incompatible ABI -change occurs. - -Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] -Signed-off-by: Trevor Woerner <twoerner@gmail.com> ---- - framework/egl/egluGLContextFactory.cpp | 4 ++-- - framework/egl/wrapper/eglwLibrary.cpp | 2 +- - framework/platform/android/tcuAndroidPlatform.cpp | 2 +- - framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp | 2 +- - .../platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp | 2 +- - framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- - 6 files changed, 9 insertions(+), 9 deletions(-) - ---- a/framework/egl/egluGLContextFactory.cpp -+++ b/framework/egl/egluGLContextFactory.cpp -@@ -63,7 +63,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" - # else --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" - # endif - #endif - -@@ -75,7 +75,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" - # else --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" - # endif - #endif - ---- a/framework/egl/wrapper/eglwLibrary.cpp -+++ b/framework/egl/wrapper/eglwLibrary.cpp -@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) - const char* DefaultLibrary::getLibraryFileName (void) - { - #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) -- return "libEGL.so"; -+ return "libEGL.so.1"; - #elif (DE_OS == DE_OS_WIN32) - return "libEGL.dll"; - #else ---- a/framework/platform/android/tcuAndroidPlatform.cpp -+++ b/framework/platform/android/tcuAndroidPlatform.cpp -@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capabil - class NativeDisplay : public eglu::NativeDisplay - { - public: -- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} -+ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} - virtual ~NativeDisplay (void) {} - - virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } ---- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -+++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibr - { - public: - Library (void) -- : eglw::DefaultLibrary("libEGL.so") -+ : eglw::DefaultLibrary("libEGL.so.1") - { - } - ---- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -+++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -@@ -66,7 +66,7 @@ public: - EGL_PLATFORM_WAYLAND_KHR, - "EGL_KHR_platform_wayland") - , m_display (waylandDisplay) -- , m_library ("libEGL.so") {} -+ , m_library ("libEGL.so.1") {} - - ~Display(void) {} - wayland::Display& getWaylandDisplay (void) { return *m_display; } ---- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -+++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -@@ -69,7 +69,7 @@ using std::vector; - - // Default library names - #if !defined(DEQP_GLES2_LIBRARY_PATH) --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" - #endif - - #if !defined(DEQP_GLES3_LIBRARY_PATH) -@@ -77,7 +77,7 @@ using std::vector; - #endif - - #if !defined(DEQP_OPENGL_LIBRARY_PATH) --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" - #endif - - #if !defined(DEQP_VULKAN_LIBRARY_PATH) -@@ -237,7 +237,7 @@ glu::RenderContext* ContextFactory::crea - } - - EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine, const glu::RenderContext *sharedContext) -- : m_egl("libEGL.so") -+ : m_egl("libEGL.so.1") - , m_contextType(config.type) - , m_eglDisplay(EGL_NO_DISPLAY) - , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb deleted file mode 100644 index 1008a5fd42..0000000000 --- a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.7.3.bb +++ /dev/null @@ -1,38 +0,0 @@ -DESCRIPTION = "Vulkan CTS" - -require khronos-cts.inc - -SRC_URI += "git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1" - -# vulkan-cts-1.3.7.3 -SRCREV_vk-gl-cts = "d71a36db16d98313c431829432a136dbda692a08" -SRCREV_amber = "933ecb4d6288675a92eb1650e0f52b1d7afe8273" -SRCREV_glslang = "c5117b328afc86e16edff6ed6afe0fe7872a7cf3" -SRCREV_spirv-headers = "b8b9eb8640c8c0107ba580fbcb10f969022ca32c" -SRCREV_spirv-tools = "bfc94f63a7adbcf8ae166f5f108ac9f69079efc0" -SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" -SRCREV_vulkan-docs = "b9aad705f0d9e5e6734ac2ad671d5d1de57b05e0" -SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" -# Not yet needed -SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" -SRCREV_video-parser = "138bbe048221d315962ddf8413aa6a08cc62a381" - -SRC_URI += "file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ - file://0001-vulkan-cts-include-missing-cstdint.patch \ -" - -TOOLCHAIN = "gcc" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" -inherit features_check - -DEPENDS += " vulkan-loader" - -do_install() { - install -d ${D}/${CTSDIR} - cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ - rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles - rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles -} diff --git a/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb new file mode 100644 index 0000000000..4ba761b676 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Vulkan CTS" + +require khronos-cts.inc + +# vulkan-cts-1.3.9.2 +SRCREV_vk-gl-cts = "24c1b1498ba4f05777f47541968ffe686265c645" +SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" +SRCREV_glslang = "2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83" +SRCREV_spirv-headers = "db5a00f8cebe81146cafabf89019674a3c4bf03d" +SRCREV_spirv-tools = "4c7e1fa5c3d988cca0e626d359d30b117b9c2822" +SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" +SRCREV_vulkan-docs = "7bb606eb87cde1d34f65f36f4d4c6f2c78f072c8" +SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +# Not yet needed +SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" +SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" + +# Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT +OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" + +REQUIRED_DISTRO_FEATURES = "vulkan" +inherit features_check + +DEPENDS += " vulkan-loader" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ + rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles +} diff --git a/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb b/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb index 807dcea1ed..ee3ee01c7d 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb @@ -17,7 +17,7 @@ DEPENDS = " \ SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "08f1d41085a6ae4bac7bc52abe2955d3354342cb" +SRCREV = "997b7c0f37faea4f8bae59613c8f27370925d5b0" inherit meson pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb index cef82bd348..33e4e0998f 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb @@ -14,6 +14,9 @@ SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd34 EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" +UPSTREAM_CHECK_URI="https://github.com/jordansissel/xdotool/tags" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)" + do_install() { oe_runmake install DESTDIR=${D} PREFIX=${prefix} } diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_392.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_394.bb index 677f5c9994..94953b288e 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_392.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-app/xterm_394.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ file://0001-include-missing-pty.h-header-for-openpty.patch \ " -SRC_URI[sha256sum] = "4d57372ef08eafa9fb7682db8d07be0fe0513e58e8478c2ec8e9b62486e7fe5e" +SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" @@ -47,3 +47,5 @@ ALTERNATIVE:${PN} = "resize x-terminal-emulator" ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" + +CVE_STATUS[CVE-1999-0965] = "cpe-incorrect: Current version (392) not affected. This was fixed in version X11R5-fix-26 (R11R6 from 1994)" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb index 8c26bf798c..171b2dec7b 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb @@ -9,6 +9,8 @@ RRECOMMENDS:${PN} += "tslib-calibrate" SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \ file://99-xf86-input-tslib.rules \ " +UPSTREAM_CHECK_URI="https://github.com/merge/xf86-input-tslib/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d78870ca88" diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index d698efa5e6..073b3f0912 100644 --- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb @@ -13,6 +13,8 @@ MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomer SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" +UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html" + DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" # These are only needed as part of the stopgap screensaver implementation: RDEPENDS:${PN} = " \ diff --git a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb index b22334fe90..8bddde9451 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/bpftool/bpftool.bb @@ -26,7 +26,7 @@ SECURITY_CFLAGS = "" do_configure[depends] += "virtual/kernel:do_shared_workdir" -COMPATIBLE_HOST = "(x86_64|aarch64).*-linux" +COMPATIBLE_HOST = "(x86_64|aarch64|riscv64).*-linux" COMPATIBLE_HOST:libc-musl = 'null' do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.5.bb index 54883cef38..54883cef38 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash-cross-canadian_8.0.5.bb diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash.inc b/meta-openembedded/meta-oe/recipes-kernel/crash/crash.inc index 04318b1505..29cff569f7 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash.inc +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash.inc @@ -23,7 +23,7 @@ SRC_URI = "git://github.com/crash-utility/${BPN}.git;branch=master;protocol=http file://donnot-extract-gdb-during-do-compile.patch \ file://gdb_build_jobs_and_not_write_crash_target.patch \ " -SRCREV = "a6832f608cb5d473739cf33bbf84ab1df8d98fd5" +SRCREV = "ceacceef7d13134d327719a624cfafed99e90f8a" SRC_URI[gdb.sha256sum] = "b33ad58d687487a821ec8d878daab0f716be60d0936f2e3ac5cf08419ce70350" diff --git a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.4.bb b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.5.bb index 1af90978e0..1af90978e0 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/crash/crash_8.0.5.bb diff --git a/meta-openembedded/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb b/meta-openembedded/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb new file mode 100644 index 0000000000..10d7c6ffda --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/drgn/python3-drgn_0.0.27.bb @@ -0,0 +1,80 @@ +SUMMARY = "drgn (pronounced dragon) is a debugger with an emphasis on \ +programmability. drgn exposes the types and variables in a program for easy, \ +expressive scripting in Python." +HOMEPAGE = "https://github.com/osandov/drgn" +LICENSE = " LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=7c83d30e99508d6b790eacdd3abab846" + +SRC_URI = "git://github.com/osandov/drgn.git;protocol=https;branch=main" +SRCREV = "a8dfc9e31f551d4b3c3d4307fa19ab6b3bfafb1c" + +S = "${WORKDIR}/git" + +DEPENDS = "\ + autoconf-native \ + automake-native \ + libtool-native \ + elfutils \ + " + +DEPENDS:append:toolchain-clang:class-target ="\ + openmp \ + " + +OPENMP_LIB = "libgomp" +OPENMP_LIB:toolchain-clang:class-target = "openmp" + +RDEPENDS:${PN} = "\ + python3-crypt \ + python3-io \ + python3-logging \ + python3-math \ + python3-pickle \ + python3-stringold \ + python3-compression \ + " + +RDEPENDS:${PN}:append:class-target = "\ + libdw \ + libelf \ + ${OPENMP_LIB} \ + " + +RDEPENDS:${PN}:append:class-native = "\ + elfutils-native \ + " + +RDEPENDS:${PN}:append:class-nativesdk = "\ + nativesdk-elfutils \ + " + +OPENMP_LIB_NAME = "gomp" +OPENMP_LIB_NAME:toolchain-clang:class-target = "omp" + +export CONFIGURE_FLAGS = "\ + --build=${BUILD_SYS}, \ + --host=${HOST_SYS}, \ + --target=${TARGET_SYS}, \ + --prefix=${prefix}, \ + --exec_prefix=${exec_prefix}, \ + --bindir=${bindir}, \ + --sbindir=${sbindir}, \ + --libexecdir=${libexecdir}, \ + --datadir=${datadir}, \ + --sysconfdir=${sysconfdir}, \ + --sharedstatedir=${sharedstatedir}, \ + --localstatedir=${localstatedir}, \ + --libdir=${libdir}, \ + --includedir=${includedir}, \ + --oldincludedir=${includedir}, \ + --infodir=${infodir}, \ + --mandir=${mandir}, \ + --enable-openmp=${OPENMP_LIB_NAME} \ + " + +export PYTHON_CPPFLAGS = "-I${STAGING_INCDIR}/${PYTHON_DIR}" + +inherit python3native pkgconfig setuptools3 + +BBCLASSEXTEND = "native nativesdk" + diff --git a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb index 2ffb527641..ebb7ed15d1 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/ipmitool/ipmitool_1.8.19.bb @@ -57,3 +57,6 @@ EXTRA_OECONF = "--disable-dependency-tracking --enable-file-security --disable-i --disable-registry-download \ " +# http://errors.yoctoproject.org/Errors/Details/766896/ +# git/lib/ipmi_fru.c:1556:41: error: initialization of 'struct fru_multirec_mgmt *' from incompatible pointer type 'struct fru_multirect_mgmt *' [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 3f57ef3bfd..f83b07dd9b 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -12,6 +12,7 @@ SRC_URI:append:libc-musl = "\ " SRC_URI += "file://run-ptest \ file://COPYING \ + file://0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch \ " # now we just test bpf and vm @@ -55,7 +56,7 @@ TEST_LIST = "\ EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ - CC="${CC}" \ + CC="${CC} ${DEBUG_PREFIX_MAP}" \ AR="${AR}" \ LD="${LD}" \ CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \ @@ -96,25 +97,13 @@ either install it and add it to HOSTTOOLS, or add clang-native from meta-clang t sed -i -e '/mrecord-mcount/d' ${S}/Makefile sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/scripts/Makefile.* - for i in ${TEST_LIST} - do - oe_runmake -C ${S}/tools/testing/selftests/${i} - done + oe_runmake -C ${S}/tools/testing/selftests TARGETS="${TEST_LIST}" } do_install() { - for i in ${TEST_LIST} - do - oe_runmake -C ${S}/tools/testing/selftests/${i} INSTALL_PATH=${D}/usr/kernel-selftest/${i} install - # Install kselftest-list.txt that required by kselftest runner. - oe_runmake -s --no-print-directory COLLECTION=${i} -C ${S}/tools/testing/selftests/${i} emit_tests \ - >> ${D}/usr/kernel-selftest/kselftest-list.txt - done - # Install kselftest runner. - install -m 0755 ${S}/tools/testing/selftests/run_kselftest.sh ${D}/usr/kernel-selftest/ - cp -R --no-dereference --preserve=mode,links -v ${S}/tools/testing/selftests/kselftest ${D}/usr/kernel-selftest/ + oe_runmake -C ${S}/tools/testing/selftests INSTALL_PATH=${D}/usr/kernel-selftest TARGETS="${TEST_LIST}" install if [ -e ${D}/usr/kernel-selftest/bpf/test_offload.py ]; then - sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py + sed -i -e '1s,#!.*python3,#! /usr/bin/env python3,' ${D}/usr/kernel-selftest/bpf/test_offload.py fi chown root:root -R ${D}/usr/kernel-selftest } @@ -149,6 +138,8 @@ remove_unrelated() { fi } +do_configure[dirs] = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" @@ -158,6 +149,12 @@ RDEPENDS:${PN} += "python3 perl perl-module-io-handle" INSANE_SKIP:${PN} += "libdir" +# A few of the selftests set compile flags that trip up the "ldflags" and +# "already-stripped" QA checks. As this is mainly a testing package and +# not really meant for user level execution, disable these two checks. +INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:${PN} += "already-stripped" + SECURITY_CFLAGS = "" COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch new file mode 100644 index 0000000000..bf5525c361 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/0001-selftests-timers-Fix-clock_adjtime-for-newer-32-bit-.patch @@ -0,0 +1,34 @@ +From 34021e84d03e2becb88e6c28e8e4867e82a81da5 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 17:40:03 -0700 +Subject: [PATCH] selftests: timers: Fix clock_adjtime for newer 32-bit arches + +Newer 32-bit architectures e.g. riscv32 are using 64-bit time_t +from get go, they have not wired __NR_clock_adjtime at all +valid-adjtimex testcase fails to compile on such architectures. +if this condition is found then use 64-bit adjtime syscall + +Upstream-Status: Submitted [https://patchwork.kernel.org/project/linux-kselftest/patch/20240918004731.3295870-1-raj.khem@gmail.com/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Cc: John Stultz <jstultz@google.com> +Cc: Shuah Khan <shuah@kernel.org> +--- + tools/testing/selftests/timers/valid-adjtimex.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c +index d500884801d8..ff4ff8b1d127 100644 +--- a/tools/testing/selftests/timers/valid-adjtimex.c ++++ b/tools/testing/selftests/timers/valid-adjtimex.c +@@ -39,7 +39,11 @@ + #include <sys/syscall.h> + int clock_adjtime(clockid_t id, struct timex *tx) + { ++#if !defined(__NR_clock_adjtime) && defined(__NR_clock_adjtime64) ++ return syscall(__NR_clock_adjtime64, id, tx); ++#else + return syscall(__NR_clock_adjtime, id, tx); ++#endif + } + + diff --git a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb index 928482ba36..914ac9f087 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.4.2.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libbpf/libbpf_1.4.6.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://../LICENSE.LGPL-2.1;md5=b370887980db5dd40659b50909238 DEPENDS = "zlib elfutils" -SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.2" -SRCREV = "1b357586a7a62db7fe27af4ebe4bdefe6986cfd6" +SRC_URI = "git://github.com/libbpf/libbpf.git;protocol=https;branch=libbpf-1.4.6" +SRCREV = "fdf402b384cc42ce29bb9e27011633be3cbafe1e" PACKAGE_ARCH = "${MACHINE_ARCH}" COMPATIBLE_HOST = "(x86_64|i.86|arm|aarch64|riscv64|powerpc|powerpc64|mips64).*-linux" diff --git a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb index c90ac19fa7..66869b29a9 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.0.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/libtracefs/libtracefs_1.8.1.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://LICENSES/GPL-2.0;md5=e6a75371ba4d16749254a51215d13f97 SECTION = "libs" DEPENDS = "libtraceevent bison-native flex-native" -SRCREV = "67f3b2ab9f836e6c9c70c94db7aac3251119a263" +SRCREV = "417c2e3aa21af670cc5c13db633dd35292f2d0fa" SRC_URI = "git://git.kernel.org/pub/scm/libs/libtrace/libtracefs.git;branch=${BPN};protocol=https \ file://0001-makefile-Do-not-preserve-ownership-in-cp-command.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb index 02a6952188..cfe3bb9682 100644 --- a/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb +++ b/meta-openembedded/meta-oe/recipes-kernel/turbostat/turbostat_3.4.bb @@ -20,6 +20,9 @@ SRC_URI += "\ file://COPYING \ " +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + PACKAGE_ARCH = "${MACHINE_ARCH}" DEPENDS = "libcap" @@ -30,7 +33,7 @@ do_populate_lic[depends] = "${PN}:do_configure" EXTRA_OEMAKE = '\ - CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ + CC="${CC}" 'CFLAGS=-Wall ${LDFLAGS}' \ ' # If we build under STAGING_KERNEL_DIR, source will not be put @@ -49,13 +52,21 @@ do_configure:prepend() { cp -r ${STAGING_KERNEL_DIR}/include/linux/bits.h ${S} cp -r ${STAGING_KERNEL_DIR}/include/linux/const.h ${S} fi + if [ -f "${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h" ]; then + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/build_bug.h ${S} + fi + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler_types.h ${S} + cp -r ${STAGING_KERNEL_DIR}/tools/include/linux/compiler-gcc.h ${S} cp -r ${STAGING_KERNEL_DIR}/tools/power/x86/turbostat/* ${S} - cp -r ${UNPACKDIR}/COPYING ${S} } do_compile() { sed -i 's#<linux/bits.h>#"bits.h"#' msr-index.h + sed -i 's#<linux/compiler.h>#"compiler.h"#' build_bug.h + sed -i 's#<linux/compiler_types.h>#"compiler_types.h"#' compiler.h + sed -i 's#<linux/compiler-gcc.h>#"compiler-gcc.h"#' compiler_types.h 'TMPCHECK='grep "<vdso/const.h>" bits.h'' || true if [ -n $TMPCHECK ]; then sed -i 's#<vdso/const.h>#"const.h"#' bits.h @@ -64,8 +75,15 @@ do_compile() { sed -i 's#<linux/const.h>#"const.h"#' bits.h sed -i -e 's#<uapi/linux/const.h>#<linux/const.h>#' -e 's#_LINUX_CONST_H#_LINUX_CONST_H_KERNEL#' const.h fi + echo '#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))' >> msr-index.h + echo "#define BIT(x) (1 << (x))" > bits.h + echo "#define BIT_ULL(nr) (1ULL << (nr))" >> bits.h + echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> bits.h + echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> bits.h + sed -i 's#MSRHEADER#"msr-index.h"#' turbostat.c sed -i 's#INTEL_FAMILY_HEADER#"intel-family.h"#' turbostat.c + sed -i 's#BUILD_BUG_HEADER#"build_bug.h"#' turbostat.c sed -i 's#\$(CC) \$(CFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#\$(CC) \$(CFLAGS) \$(LDFLAGS) \$< -o \$(BUILD_OUTPUT)/\$@#' Makefile oe_runmake STAGING_KERNEL_DIR=${STAGING_KERNEL_DIR} } diff --git a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb index bbce3e3bfd..225bc8ecb9 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/cdrkit/cdrkit_1.1.11.bb @@ -63,3 +63,8 @@ do_install:append() { } BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766905/ +# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:399:41: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] +# cdrkit/1.1.11/cdrkit-1.1.11/genisoimage/eltorito.c:422:25: error: passing argument 1 of 'set_721' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.17.3.bb index e239d028eb..3dd678f055 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.17.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libass/libass_0.17.3.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75" DEPENDS = "fontconfig freetype fribidi harfbuzz" SRC_URI = "git://github.com/libass/libass.git;protocol=https;branch=master" -SRCREV = "cbb48cc4f2f076300004b8b06a86bec55281d0c2" +SRCREV = "e46aedea0a0d17da4c4ef49d84b94a7994664ab5" S = "${WORKDIR}/git" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb index 53404e54a8..42507051f6 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libcdio/libcdio-paranoia_10.2+2.0.1.bb @@ -9,6 +9,9 @@ DEPENDS = "libcdio" SRC_URI = "${GNU_MIRROR}/libcdio/${BP}.tar.bz2" SRC_URI[sha256sum] = "33b1cf305ccfbfd03b43936975615000ce538b119989c4bec469577570b60e8a" +UPSTREAM_CHECK_URI = "https://github.com/rocky/libcdio-paranoia/releases" +UPSTREAM_CHECK_REGEX = "release-(?P<pver>\d+(\.\d+)+\+\d+(\.\d+)+)" + inherit autotools pkgconfig PACKAGES += "${PN}-utils" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch b/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch new file mode 100644 index 0000000000..287dfc8ca8 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl/0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch @@ -0,0 +1,56 @@ +From 0cf439c243dfdb6eee6133ee87172235a42e59c9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 14 Sep 2024 22:04:06 +0000 +Subject: [PATCH] cmake: Do not use -mrelax-all with clang on RISCV64 + +This option causes clang 19+ to crash on riscv64 + +For RISC-V -mrelax-all causes the assembler stage to convert +all conditional branches into + + bcc reg, reg, tmplabel + jmp target +tmplabel: + +Unconditional jmp can reach targets a lot further than a conditional branch. +Unfortunately, jmp also has a limited range so sometimes needs to be +converted to an indirect jump which requires a scratch register. +We do all branch relaxation early for RISC-V during the compilation +stage so we can allocate the scratch register. + +If the assembler also does branch relaxation it will increase the size +of the function and may cause unconditional jmps to go out of range. +If this happens, linking will fail. + +Upstream-Status: Submitted [https://github.com/libjxl/libjxl/pull/3826] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 2 +- + CONTRIBUTORS | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8b2ccb57..39bee096 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -335,7 +335,7 @@ else () + + # Machine flags. + add_compile_options(-funwind-tables) +- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") ++ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT CMAKE_SYSTEM_PROCESSOR MATCHES "riscv") + add_compile_options("SHELL:-Xclang -mrelax-all") + endif() + if (CXX_CONSTRUCTOR_ALIASES_SUPPORTED) +diff --git a/CONTRIBUTORS b/CONTRIBUTORS +index 848096f9..a88c6157 100644 +--- a/CONTRIBUTORS ++++ b/CONTRIBUTORS +@@ -10,6 +10,7 @@ Iulia-Maria Comșa + Jan Wassenberg + Jon Sneyers + Jyrki Alakuijala ++Khem Raj + Krzysztof Potempa + Lode Vandevenne + Luca Versari diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb b/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb index 8df0e9a2c2..505fca4c8f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.2.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libjxl/libjxl_0.10.3.bb @@ -8,9 +8,11 @@ inherit cmake pkgconfig mime DEPENDS = "highway brotli" -SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1" +SRC_URI = "gitsm://github.com/libjxl/libjxl.git;protocol=https;nobranch=1 \ + file://0001-cmake-Do-not-use-mrelax-all-with-clang-on-RISCV64.patch \ + " -SRCREV = "e1489592a770b989303b0edc5cc1dc447bbe0515" +SRCREV = "4a3b22d2600f92d8706fb72d85d52bfee2acbd54" S = "${WORKDIR}/git" EXTRA_OECMAKE = " \ @@ -36,6 +38,7 @@ PACKAGECONFIG ?= "mime gdk-pixbuf-loader sizeless-vectors" # 591 | HWY_RVV_FOREACH(HWY_RVV_LANES, Lanes, setvlmax_e, _ALL) # | ^ PACKAGECONFIG:remove:riscv64 = "sizeless-vectors" +PACKAGECONFIG:remove:riscv32 = "sizeless-vectors" PACKAGECONFIG[gdk-pixbuf-loader] = "-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=ON,-DJPEGXL_ENABLE_PLUGIN_GDKPIXBUF=OFF,gdk-pixbuf" PACKAGECONFIG[gimp] = "-DJPEGXL_ENABLE_PLUGIN_GIMP210=ON,-DJPEGXL_ENABLE_PLUGIN_GIMP210=OFF,gimp" PACKAGECONFIG[mime] = "-DJPEGXL_ENABLE_PLUGIN_MIME=ON,-DJPEGXL_ENABLE_PLUGIN_MIME=OFF" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb index 596c5fe86d..151530ab8f 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/libopusenc/libopusenc_0.2.1.bb @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=174b92049c2c697eb73112801662a07c" DEPENDS = "libopus" -UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/releases" +UPSTREAM_CHECK_URI = "https://github.com/xiph/libopusenc/tags" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" SRC_URI = "https://ftp.osuosl.org/pub/xiph/releases/opus/libopusenc-${PV}.tar.gz" SRC_URI[md5sum] = "f038ea0f4168d184c76b42d293697c57" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb new file mode 100644 index 0000000000..b68e67a8cb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/libplacebo_7.349.0.bb @@ -0,0 +1,22 @@ +SUMMARY ="Reusable library for GPU-accelerated video/image rendering primitives" +LICENSE = "Apache-2.0 & BSD-3-Clause & BSL-1.0 & MIT" +LIC_FILES_CHKSUM = "file://3rdparty/Vulkan-Headers/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://3rdparty/fast_float/LICENSE-APACHE;md5=81db248e90379bcfc0582b578b009bc3 \ + file://3rdparty/fast_float/LICENSE-BOOST;md5=2c7a3fa82e66676005cd4ee2608fd7d2 \ + file://3rdparty/fast_float/LICENSE-MIT;md5=32b11d50c7d9788d4270f6a83f3e68eb \ + file://3rdparty/glad/LICENSE;md5=ae570f26774ac096cff8f992091a223c \ + file://3rdparty/jinja/LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462 \ + file://3rdparty/jinja/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ + file://3rdparty/markupsafe/LICENSE.rst;md5=ffeffa59c90c9c4a033c7574f8f3fb75 \ + file://3rdparty/markupsafe/docs/license.rst;md5=5f4c795946979fabc2361be4c70d0a9f \ + file://LICENSE;md5=435ed639f84d4585d93824e7da3d85da \ + file://demos/3rdparty/nuklear/src/LICENSE;md5=6052431ae6cd4f0082276c54996e7770 \ + file://demos/LICENSE;md5=65d3616852dbf7b1a6d4b53b00626032" + +SRC_URI = "gitsm://github.com/haasn/libplacebo;protocol=https;branch=master" + +SRCREV = "1fd3c7bde7b943fe8985c893310b5269a09b46c5" + +inherit meson pkgconfig + +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch new file mode 100644 index 0000000000..b96ec5d4c4 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv/0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch @@ -0,0 +1,33 @@ +From 9878681df9919d28da3e4c6cc706e264abd9df92 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 29 Aug 2024 17:54:15 -0700 +Subject: [PATCH] file2string: Avoid emitting absolute filepaths into generated + sources + +These sources are bundled into src packages to be distributed and leaking +buildpaths results in violating reproducibility norms. + +Upstream-Status: Submitted [https://github.com/mpv-player/mpv/pull/14763] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + TOOLS/file2string.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/TOOLS/file2string.py b/TOOLS/file2string.py +index 5b1c4a95d1..39c1122a35 100755 +--- a/TOOLS/file2string.py ++++ b/TOOLS/file2string.py +@@ -22,10 +22,10 @@ + # License along with mpv. If not, see <http://www.gnu.org/licenses/>. + # + +-import sys ++import os, sys + + def file2string(infilename, infile, outfile): +- outfile.write("// Generated from %s\n\n" % infilename) ++ outfile.write("// Generated from %s\n\n" % os.path.basename(infilename)) + + conv = ["\\%03o" % c for c in range(256)] + safe_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz" \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb index 0f50a6e8fe..80e0f7ca7d 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.35.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/mplayer/mpv_0.38.0.bb @@ -9,20 +9,20 @@ DEPENDS = " \ jpeg \ libv4l \ libass \ + libplacebo \ " LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE.GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV_mpv = "140ec21c89d671d392877a7f3b91d67e7d7b9239" -SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.35;protocol=https \ - https://waf.io/waf-2.0.25;name=waf;subdir=git \ +SRCREV_mpv = "02254b92dd237f03aa0a151c2a68778c4ea848f9" +SRC_URI = "git://github.com/mpv-player/mpv;name=mpv;branch=release/0.38;protocol=https \ + file://0001-file2string-Avoid-emitting-absolute-filepaths-into-g.patch \ " -SRC_URI[waf.sha256sum] = "21199cd220ccf60434133e1fd2ab8c8e5217c3799199c82722543970dc8e38d5" S = "${WORKDIR}/git" -inherit waf pkgconfig mime-xdg +inherit meson pkgconfig mime-xdg LDFLAGS:append:riscv64 = " -latomic" @@ -42,59 +42,55 @@ PACKAGECONFIG ??= " \ ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)} \ " -PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" -PACKAGECONFIG[xv] = "--enable-xv,--disable-xv,libxv" -PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl" -PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" -PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,libdrm" -PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm" -PACKAGECONFIG[lua] = "--enable-lua,--disable-lua,lua luajit" -PACKAGECONFIG[libarchive] = "--enable-libarchive,--disable-libarchive,libarchive" -PACKAGECONFIG[jack] = "--enable-jack, --disable-jack, jack" -PACKAGECONFIG[vaapi] = "--enable-vaapi,--disable-vaapi,libva" -PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau" -PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland wayland-native libxkbcommon" +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 xsp libxv libxscrnsaver libxinerama libxpresent libxext" +PACKAGECONFIG[xv] = "-Dxv=enabled,-Dxv=disabled,libxv" +PACKAGECONFIG[opengl] = "-Dgl=enabled,-Dgl=disabled,virtual/libgl" +PACKAGECONFIG[egl] = "-Degl=enabled,-Degl-disabled,virtual/egl" +PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" +PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled,virtual/libgbm" +PACKAGECONFIG[lua] = "-Dlua=luajit,-Dlua=disabled,lua luajit" +PACKAGECONFIG[libarchive] = "-Dlibarchive=enabled,-Dlibarchive=disabled,libarchive" +PACKAGECONFIG[jack] = "-Djack=enabled,-Djack=disabled,jack" +PACKAGECONFIG[vaapi] = "-Dvaapi=enabled,-Dvaapi=disabled,libva" +PACKAGECONFIG[vdpau] = "-Dvdpau=enabled,-Dvdpau=disabled,libvdpau" +PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,wayland wayland-native libxkbcommon" python __anonymous() { packageconfig = (d.getVar("PACKAGECONFIG") or "").split() extras = [] if "x11" in packageconfig and "opengl" in packageconfig: - extras.append(" --enable-gl-x11") + extras.append(" -Dgl-x11=enabled") if "x11" in packageconfig and "egl" in packageconfig: - extras.append(" --enable-egl-x11") + extras.append(" -Degl-x11=enabled") if "egl" in packageconfig and "drm" in packageconfig: - extras.append(" --enable-egl-drm") + extras.append(" -Degl-drm=enabled") if "vaapi" in packageconfig and "x11" in packageconfig: - extras.append(" --enable-vaapi-x11") + extras.append(" -Dvaapi-x11=enabled") if "vaapi" in packageconfig and "drm" in packageconfig: - extras.append(" --enable-vaapi-drm") + extras.append(" -Dvaapi-drm=enabled") if "vaapi" in packageconfig and "x11" in packageconfig and "egl" in packageconfig: - extras.append(" --enable-vaapi-x-egl") + extras.append(" -Dvaapi-x-egl=enabled") if "vdpau" in packageconfig and "opengl" in packageconfig and "x11" in packageconfig: - extras.append(" --enable-vdpau-gl-x11") + extras.append(" -Dvdpau-gl-x11=enabled") if "wayland" in packageconfig and "opengl" in packageconfig: - extras.append(" --enable-gl-wayland") + extras.append(" -Dgl-wayland=enabled") if "wayland" in packageconfig and "vaapi" in packageconfig: - extras.append(" --enable-vaapi-wayland") + extras.append(" -Dvaapi-wayland=enabled") if extras: d.appendVar("EXTRA_OECONF", "".join(extras)) } -SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" +#SIMPLE_TARGET_SYS = "${@'${TARGET_SYS}'.replace('${TARGET_VENDOR}', '')}" EXTRA_OECONF = " \ - --prefix=${prefix} \ - --target=${SIMPLE_TARGET_SYS} \ - --confdir=${sysconfdir} \ - --datadir=${datadir} \ - --disable-manpage-build \ - --disable-libbluray \ - --disable-dvdnav \ - --disable-cdda \ - --disable-uchardet \ - --disable-rubberband \ - --disable-lcms2 \ - --disable-vapoursynth \ + -Dmanpage-build=disabled \ + -Dlibbluray=disabled \ + -Ddvdnav=disabled \ + -Dcdda=disabled \ + -Duchardet=disabled \ + -Drubberband=disabled \ + -Dlcms2=disabled \ + -Dvapoursynth=disabled \ ${PACKAGECONFIG_CONFARGS} \ " @@ -102,11 +98,6 @@ do_configure:append() { sed -i -e 's#${WORKDIR}#<WORKDIR>#g' ${B}/config.h } -link_waf() { - ln -s waf-2.0.25 ${S}/waf -} -do_unpack[postfuncs] += "link_waf" - FILES:${PN} += " \ ${datadir}/icons \ ${datadir}/zsh \ diff --git a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb index 012fc3a94d..29500bdb94 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/pulseaudio/pavucontrol_5.0.bb @@ -14,7 +14,7 @@ inherit autotools features_check perlnative pkgconfig ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -SRC_URI = "http://freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" +SRC_URI = "http://www.freedesktop.org/software/pulseaudio/${BPN}/${BP}.tar.xz" SRC_URI:append = " ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'file://0001-pavucontrol-remove-canberra-gtk-support.patch', '', d)}" SRC_URI[sha256sum] = "ce2b72c3b5f1a70ad0df19dd81750f9455bd20870d1d3a36d20536af2e8f4e7a" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb index 87320a98e8..508519e4f8 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/sound-themes/sound-theme-freedesktop_0.8.bb @@ -11,6 +11,6 @@ inherit autotools gettext DEPENDS += "glib-2.0-native" -SRC_URI = "http://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2" +SRC_URI = "https://people.freedesktop.org/~mccann/dist/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "d7387912cfd275282d1ec94483cb2f62" SRC_URI[sha256sum] = "cb518b20eef05ec2e82dda1fa89a292c1760dc023aba91b8aa69bafac85e8a14" diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch deleted file mode 100644 index 64c01e4977..0000000000 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 502c0302827cec3d2b2a69fb25189646685ef2ff Mon Sep 17 00:00:00 2001 -From: Fabio Estevam <festevam@denx.de> -Date: Fri, 12 Jan 2024 00:17:14 -0300 -Subject: [PATCH] keytable: meson: Restrict the installation of - 50-rc_keymap.conf - -Currently, meson tries to install 50-rc_keymap.conf even if systemd -is not used. - -Commit 01f2c6c58e6f ("keytable: restrict installation of 50-rc_keymap.conf"), -only allowed 50-rc_keymap.conf to be installed when both BPF and systemd -were used. - -Apply the same logic in meson to fix the problem. - -Signed-off-by: Fabio Estevam <festevam@denx.de> -Signed-off-by: Sean Young <sean@mess.org> -Upstream-Status: Backport [https://git.linuxtv.org/v4l-utils.git/commit/?id=a21924ec424c4744af6f2a794e0677eba35dd168] ---- - utils/keytable/meson.build | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/utils/keytable/meson.build b/utils/keytable/meson.build -index 4130a4bea514..76ce329eae8e 100644 ---- a/utils/keytable/meson.build -+++ b/utils/keytable/meson.build -@@ -69,6 +69,8 @@ ir_keytable_udev_rules = files( - install_data(ir_keytable_udev_rules, - install_dir : ir_keytable_system_dir / 'rules.d') - -+if ir_bpf_enabled -+if dep_systemd.found() - if have_udevdsyscallfilter - ir_keytable_systemd_files = files( - '50-rc_keymap.conf', -@@ -76,6 +78,8 @@ if have_udevdsyscallfilter - install_data(ir_keytable_systemd_files, - install_dir : systemd_systemdir / 'systemd-udevd.service.d') - endif -+endif -+endif - - # Install non-existing directory to create empty directory structure - # See: https://github.com/mesonbuild/meson/issues/2904 --- -2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch new file mode 100644 index 0000000000..6c946d8c48 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0001-media-ctl-Install-media-ctl-header-and-library-files.patch @@ -0,0 +1,78 @@ +From 3867fcfa4389c7fa271705f1fd1d4bfb74bc1bd1 Mon Sep 17 00:00:00 2001 +From: Neel Gandhi <neel.gandhi@amd.com> +Date: Wed, 5 Jun 2024 13:51:36 +0530 +Subject: [PATCH] media-ctl: Install media-ctl header and library files + +Install mediactl and v4l2subdev header and library +files, which may be required by 3rd party applications +to populate and control v4l2subdev device node tree + +Install of these files was removed in upstream commit +0911dce53b08b0df3066be2c75f67e8a314d8729. + +Upstream-Status: Denied + +v4l-utils maintainers do not promise a stable API for this library, and +do not currently have the time to do so. So exporting the API in this +way is fine, as long as we understand that it will change and users of +the API will need to adapt over time. + +Signed-off-by: Neel Gandhi <neel.gandhi@amd.com> +Signed-off-by: Mark Hatle <mark.hatle@amd.com> +--- + utils/media-ctl/meson.build | 28 +++++++++++++++++++++------- + 1 file changed, 21 insertions(+), 7 deletions(-) + +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build +index 3a7b0c9a..40669b4c 100644 +--- a/utils/media-ctl/meson.build ++++ b/utils/media-ctl/meson.build +@@ -3,14 +3,24 @@ libmediactl_sources = files( + 'mediactl-priv.h', + ) + ++libmediactl_api = files( ++ 'mediactl.h', ++ 'v4l2subdev.h', ++) ++ ++install_headers(libmediactl_api, subdir: 'mediactl') ++ + libmediactl_deps = [ + dep_libudev, + ] + +-libmediactl = static_library('mediactl', +- libmediactl_sources, +- dependencies : libmediactl_deps, +- include_directories : v4l2_utils_incdir) ++libmediactl = library('mediactl', ++ libmediactl_sources, ++ soversion: '0', ++ version: '0.0.0', ++ install : true, ++ dependencies : libmediactl_deps, ++ include_directories : v4l2_utils_incdir) + + dep_libmediactl = declare_dependency(link_with : libmediactl) + +@@ -18,9 +28,13 @@ libv4l2subdev_sources = files('libv4l2subdev.c') + libv4l2subdev_sources += media_bus_format_names_h + libv4l2subdev_sources += media_bus_format_codes_h + +-libv4l2subdev = static_library('v4l2subdev', +- libv4l2subdev_sources, +- include_directories : v4l2_utils_incdir) ++libv4l2subdev = library('v4l2subdev', ++ libv4l2subdev_sources, ++ soversion: '0', ++ version: '0.0.0', ++ install : true, ++ dependencies : dep_libmediactl, ++ include_directories : v4l2_utils_incdir) + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) + +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch new file mode 100644 index 0000000000..8a009ae806 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils/0002-media-ctl-Install-media-ctl-pkg-config-files.patch @@ -0,0 +1,49 @@ +From a422ddf7f8805d34ff1fbb46d335993c9cd05ead Mon Sep 17 00:00:00 2001 +From: Einar Jon Gunnarsson <tolvupostur@gmail.com> +Date: Fri, 10 May 2024 11:56:17 +0200 +Subject: [PATCH] media-ctl: Install media-ctl pkg-config files + +libv4l2subdev/libmediactl can not be used in projects without the +pkg-config files. This adds them as well. + +Upstream-Status: Denied + +This is an add-on to the previous patch: +0001-media-ctl-Install-media-ctl-header-and-library-files.patch +so same restrictions apply. + +Signed-off-by: Einar Jon Gunnarsson <tolvupostur@gmail.com> +--- + utils/media-ctl/meson.build | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/utils/media-ctl/meson.build b/utils/media-ctl/meson.build +index 40669b4c..6feba1af 100644 +--- a/utils/media-ctl/meson.build ++++ b/utils/media-ctl/meson.build +@@ -38,6 +38,12 @@ libv4l2subdev = library('v4l2subdev', + + dep_libv4l2subdev = declare_dependency(link_with : libv4l2subdev) + ++pkg.generate( ++ libv4l2subdev, ++ name : 'libv4l2subdev', ++ version : meson.project_version(), ++ description : 'v4l2 subdev library') ++ + media_ctl_sources = files( + 'media-ctl.c', + 'options.c', +@@ -55,3 +61,9 @@ media_ctl = executable('media-ctl', + dependencies : media_ctl_deps, + install : true, + include_directories : v4l2_utils_incdir) ++ ++pkg.generate( ++ libmediactl, ++ name : 'libmediactl', ++ version : meson.project_version(), ++ description : 'v4l2 mediactl library') +-- +2.43.5 + diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb index 52759ef18e..afe217e1f3 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.26.1.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/v4l-utils_1.28.1.bb @@ -26,16 +26,17 @@ PACKAGECONFIG[qvidcap] = ",-Dqvidcap=disabled" PACKAGECONFIG[v4l2-tracer] = ",-Dv4l2-tracer=disabled,json-c" SRC_URI = "\ - git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.26 \ - file://0001-keytable-meson-Restrict-the-installation-of-50-rc_ke.patch \ + git://git.linuxtv.org/v4l-utils.git;protocol=https;branch=stable-1.28 \ + file://0001-media-ctl-Install-media-ctl-header-and-library-files.patch \ + file://0002-media-ctl-Install-media-ctl-pkg-config-files.patch \ " -SRCREV = "4aee01a027923cab1e40969f56f8ba58d3e6c0d1" - -PV .= "+git" +SRCREV = "fc15e229d9d337e46d730f00647821adbbd58548" S = "${WORKDIR}/git" +UPSTREAM_CHECK_GITTAGREGEX = "v4l-utils-(?P<pver>\d+(\.\d+)+)" + EXTRA_OEMESON = "-Dudevdir=${base_libdir}/udev -Dv4l2-compliance-32=false -Dv4l2-ctl-32=false" # Disable the erroneous installation of gconv-modules that would break glib diff --git a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb index 3069528301..699b5608db 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/v4l2apps/yavta_git.bb @@ -2,23 +2,14 @@ SUMMARY = "Yet Another V4L2 Test Application" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.GPL;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master \ +SRC_URI = "git://git.ideasonboard.org/yavta.git;branch=master;protocol=https \ " -SRCREV = "65f740aa1758531fd810339bc1b7d1d33666e28a" +SRCREV = "52c975e5542504ac10bed8b1d68df5c75951d202" PV = "0.0" S = "${WORKDIR}/git" -EXTRA_OEMAKE = "-e MAKEFLAGS=" - -# The yavta sources include copies of the headers required to build in the -# include directory. The Makefile uses CFLAGS to include these, but since -# we override the CFLAGS then we need to add this include path back in. -CFLAGS += "-I${S}/include" - -do_install() { - install -d ${D}${bindir} - install -m 0755 yavta ${D}${bindir} -} - +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" +inherit meson diff --git a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb index c611da48c0..32f7bae0dc 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb +++ b/meta-openembedded/meta-oe/recipes-multimedia/xsp/xsp_1.0.0-8.bb @@ -13,3 +13,5 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI[md5sum] = "2a0d8d02228d4cbd28b6e07bb7c17cf5" SRC_URI[sha256sum] = "8b722b952b64841d996c70c3278499886c81bb5012991beed5f66f4158418f59" + +CVE_STATUS[CVE-2006-2658] = "cpe-incorrect: The recipe used in the `meta-openembedded` is a different xsp package compared to the one which has the CVE issue." diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch index 18e7185649..d2c0e4df67 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue/0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch @@ -8,10 +8,10 @@ Subject: [PATCH] libgeoclue: don't try to use g-ir-scanner when introspection http://errors.yoctoproject.org/Errors/Details/702778/ geoclue/2.7.0-r0/recipe-sysroot/usr/bin/g-ir-scanner-wrapper: line 5: g-ir-scanner: command not found -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +--- libgeoclue/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb index 9fcd1e6f1e..db0142502f 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/geoclue/geoclue_2.7.2.bb @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bdfdd4986a0853eb84eeba85f9d0c4d6" DEPENDS = "glib-2.0 dbus json-glib libsoup-3.0 intltool-native" -inherit meson pkgconfig gtk-doc gobject-introspection vala useradd +inherit meson pkgconfig gtk-doc gobject-introspection vala -SRCREV = "8a24f60969d4c235d9918796c38a6a9c42e10131" +SRCREV = "ab0a7a447ac037d5043aa04df3030796bf47d94d" SRC_URI = "git://gitlab.freedesktop.org/geoclue/geoclue.git;protocol=https;branch=master \ file://0001-libgeoclue-don-t-try-to-use-g-ir-scanner-when-intros.patch \ " @@ -36,17 +36,6 @@ EXTRA_OEMESON += " \ -Ddbus-sys-dir=${sysconfdir}/dbus-1/system.d \ " -USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 --shell /bin/nologin polkitd" - -do_install:append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'modem-gps', 'true', 'false', d)}; then - # Fix up permissions on polkit rules.d to work with rpm4 constraints - chmod 700 ${D}/${datadir}/polkit-1/rules.d - chown polkitd:root ${D}/${datadir}/polkit-1/rules.d - fi -} - FILES:${PN} += " \ ${datadir}/dbus-1/system-services \ ${datadir}/polkit-1/rules.d \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch new file mode 100644 index 0000000000..8942b39524 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd/fix-pps_strerror_r.patch @@ -0,0 +1,51 @@ +From c72a489e2eb13296c7b514b7341033114abf430a Mon Sep 17 00:00:00 2001 +From: Miroslav Lichvar <mlichvar@redhat.com> +Date: Mon, 22 Apr 2024 11:31:24 +0200 +Subject: [PATCH 1/2] SConscript: provide variable names to MergeFlags + +If the scons MergeFlags() function is provided with a list of +compiler/linker options, it needs to guess what options belong where. If +it doesn't recognize an option, it is silently ignored. There are also +ambiguous options that could be both in CFLAGS and LINKFLAGS (e.g. -spec). + +Provide MergeFlags() with a dict instead of list to avoid the guesswork +in order to pass all options, even if some are not recognized by scons. +Switch LDFLAGS to LINKFLAGS for better compatibility with existing +scripts. + +Upstream-Status: Submitted [https://gitlab.com/gpsd/gpsd/-/merge_requests/406] +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> + +--- + SConscript | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/SConscript b/SConscript +index dab481654..ee90d87c4 100644 +--- a/SConscript ++++ b/SConscript +@@ -585,8 +585,8 @@ env['SC_PYTHON'] = sys.executable # Path to SCons Python + # explicitly quote them or (better yet) use the "=" form of GNU option + # settings. + # +-# Scons also uses different internal names than most other build-systems. +-# So we rely on MergeFlags/ParseFlags to do the right thing for us. ++# Scons also uses different internal names than most other build-systems, ++# e.g. it uses LINKFLAGS instead of LDFLAGS. + # + # scons uses gcc, or clang, to link. Thus LDFLAGS does not serve its + # traditional function of providing arguments to ln. LDFLAGS set in the +@@ -618,7 +618,10 @@ for i in ["ARFLAGS", + "SHLINKFLAGS", + ]: + if i in os.environ: +- env.MergeFlags(Split(os.getenv(i))) ++ t = i ++ if t == "LDFLAGS": ++ t = "LINKFLAGS" ++ env.MergeFlags({t: Split(os.getenv(i))}) + + + # Keep scan-build options in the environment +-- +GitLab diff --git a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb index ddea8ad2e3..e3b2f8bf69 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.24.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/gpsd/gpsd_3.25.bb @@ -7,8 +7,9 @@ PROVIDES = "virtual/gpsd" SRC_URI = "${SAVANNAH_GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://gpsd.init \ + file://fix-pps_strerror_r.patch \ " -SRC_URI[sha256sum] = "00ee13f615655284874a661be13553abe66128e6deb5cd648af9bc0cb345fe5c" +SRC_URI[sha256sum] = "b368b6a305e3f7a6382d23a0cbfc1d78923060b6b7f54cf7987a73c7b4a9afc2" inherit scons update-rc.d python3-dir python3native systemd update-alternatives pkgconfig @@ -26,6 +27,7 @@ CLEANBROKEN = "1" PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} usb" PACKAGECONFIG[bluez] = "bluez='true',bluez='false',bluez5" PACKAGECONFIG[qt] = "qt='yes' qt_versioned=5,qt='no',qtbase" +PACKAGECONFIG[pyserial] = "" PACKAGECONFIG[usb] = "usb='true',usb='false',libusb1" EXTRA_OESCONS = " \ sysroot=${STAGING_DIR_TARGET} \ @@ -79,7 +81,7 @@ do_install:append() { fi } -PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gps-utils gps-utils-python" +PACKAGES =+ "libgps python3-pygps gpsd-udev gpsd-conf gpsd-gpsctl gpsd-snmp gps-utils gps-utils-python" RPROVIDES:${PN}-dbg += "python-pygps-dbg" @@ -104,6 +106,9 @@ CONFFILES:gpsd-conf = "${sysconfdir}/default/gpsd.default" SUMMARY:gpsd-gpsctl = "Tool for tweaking GPS modes" FILES:gpsd-gpsctl = "${bindir}/gpsctl" +SUMMARY:gpsd-snmp = "MIB for using SNMP with gpsd" +FILES:gpsd-snmp = "${datadir}/snmp" + SUMMARY:gps-utils = "Utils used for simulating, monitoring,... a GPS" FILES:gps-utils = "\ ${bindir}/cgps \ @@ -143,7 +148,7 @@ FILES:python3-pygps = "${PYTHON_SITEPACKAGES_DIR}/* ${libdir}/gps/*.py ${libdir} RDEPENDS:python3-pygps = " \ python3-core \ python3-io \ - python3-pyserial \ + ${@bb.utils.contains('PACKAGECONFIG', 'pyserial', 'python3-pyserial', '', d)} \ python3-threading \ python3-terminal \ gpsd \ diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch new file mode 100644 index 0000000000..daef7fab49 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch @@ -0,0 +1,29 @@ +From 406e841b3e011e1090f23dba12b12cdd9ec4707e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 24 Aug 2024 15:19:35 -0700 +Subject: [PATCH] wfs: Cover xmlNanoHTTPCleanup with LIBXML_HTTP_ENABLED + +libxml2 has deprecated internal http support [1] + +[1] https://www.gaia-gis.it/fossil/libspatialite/tktview?name=7c452740fe + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/wfs/wfs_in.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/wfs/wfs_in.c b/src/wfs/wfs_in.c +index 1cfe39d..41ad2ab 100644 +--- a/src/wfs/wfs_in.c ++++ b/src/wfs/wfs_in.c +@@ -4638,7 +4638,9 @@ SPATIALITE_DECLARE void + reset_wfs_http_connection (void) + { + /* Resets the libxml2 "nano HTTP": useful when changing the HTTP_PROXY settings */ ++#ifdef LIBXML_HTTP_ENABLED + xmlNanoHTTPCleanup (); ++#endif + } + + #else /* LIBXML2 isn't enabled */ diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch deleted file mode 100644 index 6f1c165f58..0000000000 --- a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -diff -rupN --no-dereference libspatialite-5.0.1/configure.ac libspatialite-5.0.1-new/configure.ac ---- libspatialite-5.0.1/configure.ac 2021-03-08 08:57:18.748858216 +0100 -+++ libspatialite-5.0.1-new/configure.ac 2021-03-08 08:57:18.751858215 +0100 -@@ -96,7 +96,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - AC_PROG_MAKE_SET - AC_LIBTOOL_WIN32_DLL --AC_PROG_LIBTOOL -+LT_INIT - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch index de6e50a58d..4b381eda88 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite/libspatialite_pkgconfig.patch @@ -1,13 +1,13 @@ Upstream-Status: Pending -diff -rupN libspatialite-5.0.1/spatialite.pc.in libspatialite-5.0.1-new/spatialite.pc.in ---- libspatialite-5.0.1/spatialite.pc.in 2021-02-07 16:53:46.000000000 +0100 -+++ libspatialite-5.0.1-new/spatialite.pc.in 2021-02-10 09:54:09.647552994 +0100 -@@ -8,5 +8,6 @@ includedir=@includedir@ +--- a/spatialite.pc.in ++++ b/spatialite.pc.in +@@ -8,5 +8,7 @@ includedir=@includedir@ Name: spatialite Description: Spatial SQL database engine based on SQLite Version: @VERSION@ --Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ -lm -+Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ -lm +-Libs: -L${libdir} -lspatialite @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm ++Libs.private: -L${libdir} @LIBS@ @LIBXML2_LIBS@ @SQLITE3_LIBS@ -lm +Libs: -L${libdir} -lspatialite ++ Cflags: -I${includedir} diff --git a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb index f46b1083e1..0fe0bb1197 100644 --- a/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-navigation/libspatialite/libspatialite_5.1.0.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e92e1a36cc384b60f5b31dde0bdd39e" SRC_URI = "http://www.gaia-gis.it/gaia-sins/libspatialite-sources/libspatialite-${PV}.tar.gz \ file://libspatialite_geos.patch \ - file://libspatialite_macros.patch \ file://libspatialite_pkgconfig.patch \ + file://0001-wfs-Cover-xmlNanoHTTPCleanup-with-LIBXML_HTTP_ENABLE.patch \ " - -SRC_URI[sha256sum] = "eecbc94311c78012d059ebc0fae86ea5ef6eecb13303e6e82b3753c1b3409e98" +SRC_URI[sha256sum] = "43be2dd349daffe016dd1400c5d11285828c22fea35ca5109f21f3ed50605080" inherit autotools-brokensep pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb index efcd1aab8a..ff4ed16794 100644 --- a/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb +++ b/meta-openembedded/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb @@ -11,6 +11,8 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" +UPSTREAM_CHECK_URI = "https://github.com/OpenPrinting/cups-filters/releases" + inherit autotools gettext pkgconfig github-releases EXTRA_OECONF += " \ diff --git a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.9.1.bb index 4778be42b5..f8b398c325 100644 --- a/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-printing/qpdf/qpdf_11.9.1.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" DEPENDS = "zlib jpeg ${@bb.utils.contains('PACKAGECONFIG', 'gnutls', 'gnutls', 'openssl', d)}" SRC_URI = "git://github.com/qpdf/qpdf.git;protocol=https;branch=main" -SRCREV = "3b97c9bd266b7c32ea36d3536e22dab77412886d" +SRCREV = "c03ee7aa663c4361e23ca32b596adf6e8be0e8ac" inherit cmake pkgconfig gettext diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch b/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch deleted file mode 100644 index b1f324f22d..0000000000 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit/0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 88c9b2c5cebebf13f90890baebbadc60d9fe8d16 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 9 Aug 2022 23:57:03 -0700 -Subject: [PATCH] Replace __attribute_malloc__ with __attribute__((__malloc__)) - -__attribute_malloc__ is not available on musl - -Fixes -| ../../git/auparse/auparse.h:54:2: error: expected function body after function declarator -| __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); -| ^ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - audisp/plugins/remote/queue.h | 2 +- - auparse/auparse.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/audisp/plugins/remote/queue.h b/audisp/plugins/remote/queue.h -index 36b70d04..031507dc 100644 ---- a/audisp/plugins/remote/queue.h -+++ b/audisp/plugins/remote/queue.h -@@ -53,7 +53,7 @@ void q_close(struct queue *q); - * On error, return NULL and set errno. */ - struct queue *q_open(int q_flags, const char *path, size_t num_entries, - size_t entry_size) -- __attribute_malloc__ __attr_dealloc (q_close, 1) __wur; -+ __attribute__((__malloc__)) __attr_dealloc (q_close, 1) __wur; - - /* Add DATA to tail of Q. Return 0 on success, -1 on error and set errno. */ - int q_append(struct queue *q, const char *data); -diff --git a/auparse/auparse.h b/auparse/auparse.h -index c27f1ff9..87c52965 100644 ---- a/auparse/auparse.h -+++ b/auparse/auparse.h -@@ -55,7 +55,7 @@ typedef void (*auparse_callback_ptr)(auparse_state_t *au, - void auparse_destroy(auparse_state_t *au); - void auparse_destroy_ext(auparse_state_t *au, auparse_destroy_what_t what); - auparse_state_t *auparse_init(ausource_t source, const void *b) -- __attribute_malloc__ __attr_dealloc (auparse_destroy, 1); -+ __attribute__((__malloc__)) __attr_dealloc (auparse_destroy, 1); - int auparse_new_buffer(auparse_state_t *au, const char *data, size_t data_len) - __attr_access ((__read_only__, 2, 3)); - int auparse_feed(auparse_state_t *au, const char *data, size_t data_len) --- -2.25.1 - diff --git a/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.1.bb b/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.2.bb index c189cfea55..4f1507923a 100644 --- a/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/audit/audit_4.0.2.bb @@ -13,10 +13,8 @@ SRC_URI = "git://github.com/linux-audit/${BPN}-userspace.git;branch=master;proto file://audit-volatile.conf \ " -SRC_URI:append:libc-musl = " file://0001-Replace-__attribute_malloc__-with-__attribute__-__ma.patch" - S = "${WORKDIR}/git" -SRCREV = "22ccbd984e493524050ac445f796e9a7e90e1149" +SRCREV = "4e6deae41d4646d28bb3ba9524a8a227a38ccd0b" inherit autotools python3targetconfig update-rc.d systemd @@ -95,9 +93,17 @@ do_install:append() { if ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'true', 'false', d)}; then install -D -m 0755 ${UNPACKDIR}/auditd ${D}/etc/init.d/auditd + fi + + if ! ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then rm -rf ${D}${libdir}/systemd + install -d ${D}${systemd_unitdir}/system + install -m 0644 ${B}/init.d/auditd.service ${D}${systemd_unitdir}/system/ + install -m 0644 ${B}/init.d/audit-rules.service ${D}${systemd_unitdir}/system/ fi # Create /var/spool/audit directory for audisp-remote install -d -m 0700 ${D}${localstatedir}/spool/audit } + +CVE_PRODUCT = "linux:audit" diff --git a/meta-openembedded/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb b/meta-openembedded/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb index c60c1dfd63..60155e035b 100644 --- a/meta-openembedded/meta-oe/recipes-security/bubblewrap/bubblewrap_0.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-security/bubblewrap/bubblewrap_0.10.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2" DEPENDS = "libcap" SRC_URI = "https://github.com/containers/${BPN}/releases/download/v${PV}/${BP}.tar.xz" -SRC_URI[sha256sum] = "c6347eaced49ac0141996f46bba3b089e5e6ea4408bc1c43bab9f2d05dd094e1" +SRC_URI[sha256sum] = "65d92cf44a63a51e1b7771f70c05013dce5bd6b0b2841c4b4be54b0c45565471" inherit autotools bash-completion github-releases manpages pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch deleted file mode 100644 index 2ca18b0efb..0000000000 --- a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-Make-ndiff-support-python3.patch +++ /dev/null @@ -1,1720 +0,0 @@ -From bbbf474b2ebdbdac4d557e3351210f3fe2175c33 Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Fri, 14 Feb 2020 10:09:55 +0000 -Subject: [PATCH] Make ndiff support python3 - -Backport a patch from debian to make ndiff support -python3. - -Refer to https://sources.debian.org/data/main/n/nmap/7.80+dfsg1-2/debian/patches/0004-Python3-port-of-ndiff.patch - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - Makefile.in | 12 +- - ndiff/ndiff.py | 495 +++++++++++++++++----------------- - ndiff/ndifftest.py | 94 +++---- - ndiff/scripts/ndiff | 14 +- - ndiff/setup.py | 34 +-- - ndiff/test-scans/anonymize.py | 18 +- - 6 files changed, 333 insertions(+), 334 deletions(-) - mode change 100644 => 100755 ndiff/setup.py - -diff --git a/Makefile.in b/Makefile.in -index eee8863..32f86ba 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -35,6 +35,7 @@ ZENMAPDIR = @ZENMAPDIR@ - NDIFFDIR = @NDIFFDIR@ - NPINGDIR = @NPINGDIR@ - PYTHON = @PYTHON@ -+PYTHON3 = /usr/bin/env python3 - DEFS = @DEFS@ -DNMAP_PLATFORM=\"$(NMAP_PLATFORM)\" -DNMAPDATADIR=\"$(nmapdatadir)\" - # With GCC, add extra security checks to source code. - # http://gcc.gnu.org/ml/gcc-patches/2004-09/msg02055.html -@@ -260,7 +261,7 @@ clean-zenmap: - rm -f $(ZENMAPDIR)/zenmapCore/Name.pyc - - clean-ndiff: -- -cd $(NDIFFDIR) && $(PYTHON) setup.py clean --all -+ -cd $(NDIFFDIR) && $(PYTHON3) setup.py clean --all - - clean-nping: - -cd $(NPINGDIR) && $(MAKE) clean -@@ -368,6 +369,7 @@ tests/check_dns: $(OBJS) - # this as the location of the interpreter whenever we're not doing a - # local installation. - DEFAULT_PYTHON_PATH = /usr/bin/env python -+DEFAULT_PYTHON3_PATH = /usr/bin/env python3 - - build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py - # When DESTDIR is defined, assume we're building an executable -@@ -388,13 +390,13 @@ install-zenmap: $(ZENMAPDIR)/setup.py - ln -sf zenmap $(DESTDIR)$(bindir)/xnmap - - build-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON_PATH)") -+ cd $(NDIFFDIR) && $(PYTHON3) setup.py build $(if $(DESTDIR),--executable "$(DEFAULT_PYTHON3_PATH)") - - build-nping: $(NPINGDIR)/Makefile build-nbase build-nsock build-netutil $(NPINGDIR)/nping.h @DNET_BUILD@ @PCAP_BUILD@ - @cd $(NPINGDIR) && $(MAKE) - - install-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(NDIFFDIR) && $(PYTHON3) setup.py install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" $(if $(DESTDIR),--root "$(DESTDIR)") - - NSE_FILES = scripts/script.db scripts/*.nse - NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc -@@ -443,7 +445,7 @@ uninstall-zenmap: - rm -f $(DESTDIR)$(bindir)/xnmap - - uninstall-ndiff: -- cd $(NDIFFDIR) && $(PYTHON) setup.py uninstall -+ cd $(NDIFFDIR) && $(PYTHON3) setup.py uninstall - - uninstall-ncat: - @cd $(NCATDIR) && $(MAKE) uninstall -@@ -458,7 +460,7 @@ check-ncat: - @cd $(NCATDIR) && $(MAKE) check - - check-ndiff: -- @cd $(NDIFFDIR) && $(PYTHON) ndifftest.py -+ @cd $(NDIFFDIR) && $(PYTHON3) ndifftest.py - - check-nsock: - @cd $(NSOCKDIR)/src && $(MAKE) check -diff --git a/ndiff/ndiff.py b/ndiff/ndiff.py -index 043273f..abbd1c5 100755 ---- a/ndiff/ndiff.py -+++ b/ndiff/ndiff.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Ndiff - # -@@ -26,11 +26,11 @@ xml.__path__ = [x for x in xml.__path__ if "_xmlplus" not in x] - import xml.sax - import xml.sax.saxutils - import xml.dom.minidom --from StringIO import StringIO -+from io import StringIO - - verbose = False - --NDIFF_XML_VERSION = u"1" -+NDIFF_XML_VERSION = "1" - - - class OverrideEntityResolver(xml.sax.handler.EntityResolver): -@@ -78,35 +78,35 @@ class Scan(object): - def write_nmaprun_open(self, writer): - attrs = {} - if self.scanner is not None: -- attrs[u"scanner"] = self.scanner -+ attrs["scanner"] = self.scanner - if self.args is not None: -- attrs[u"args"] = self.args -+ attrs["args"] = self.args - if self.start_date is not None: -- attrs[u"start"] = "%d" % time.mktime(self.start_date.timetuple()) -- attrs[u"startstr"] = self.start_date.strftime( -+ attrs["start"] = "%d" % time.mktime(self.start_date.timetuple()) -+ attrs["startstr"] = self.start_date.strftime( - "%a %b %d %H:%M:%S %Y") - if self.version is not None: -- attrs[u"version"] = self.version -- writer.startElement(u"nmaprun", attrs) -+ attrs["version"] = self.version -+ writer.startElement("nmaprun", attrs) - - def write_nmaprun_close(self, writer): -- writer.endElement(u"nmaprun") -+ writer.endElement("nmaprun") - - def nmaprun_to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"nmaprun") -+ elem = document.createElement("nmaprun") - if self.scanner is not None: -- elem.setAttribute(u"scanner", self.scanner) -+ elem.setAttribute("scanner", self.scanner) - if self.args is not None: -- elem.setAttribute(u"args", self.args) -+ elem.setAttribute("args", self.args) - if self.start_date is not None: - elem.setAttribute( -- u"start", "%d" % time.mktime(self.start_date.timetuple())) -+ "start", "%d" % time.mktime(self.start_date.timetuple())) - elem.setAttribute( -- u"startstr", -+ "startstr", - self.start_date.strftime("%a %b %d %H:%M:%S %Y")) - if self.version is not None: -- elem.setAttribute(u"version", self.version) -+ elem.setAttribute("version", self.version) - frag.appendChild(elem) - return frag - -@@ -136,17 +136,17 @@ class Host(object): - - def format_name(self): - """Return a human-readable identifier for this host.""" -- address_s = u", ".join(a.s for a in sorted(self.addresses)) -- hostname_s = u", ".join(sorted(self.hostnames)) -+ address_s = ", ".join(a.s for a in sorted(self.addresses)) -+ hostname_s = ", ".join(sorted(self.hostnames)) - if len(hostname_s) > 0: - if len(address_s) > 0: -- return u"%s (%s)" % (hostname_s, address_s) -+ return "%s (%s)" % (hostname_s, address_s) - else: - return hostname_s - elif len(address_s) > 0: - return address_s - else: -- return u"<no name>" -+ return "<no name>" - - def add_port(self, port): - self.ports[port.spec] = port -@@ -163,46 +163,46 @@ class Host(object): - return state is None or state in self.extraports - - def extraports_string(self): -- list = [(count, state) for (state, count) in self.extraports.items()] -+ locallist = [(count, state) for (state, count) in list(self.extraports.items())] - # Reverse-sort by count. -- list.sort(reverse=True) -- return u", ".join( -- [u"%d %s ports" % (count, state) for (count, state) in list]) -+ locallist.sort(reverse=True) -+ return ", ".join( -+ ["%d %s ports" % (count, state) for (count, state) in locallist]) - - def state_to_dom_fragment(self, document): - frag = document.createDocumentFragment() - if self.state is not None: -- elem = document.createElement(u"status") -- elem.setAttribute(u"state", self.state) -+ elem = document.createElement("status") -+ elem.setAttribute("state", self.state) - frag.appendChild(elem) - return frag - - def hostname_to_dom_fragment(self, document, hostname): - frag = document.createDocumentFragment() -- elem = document.createElement(u"hostname") -- elem.setAttribute(u"name", hostname) -+ elem = document.createElement("hostname") -+ elem.setAttribute("name", hostname) - frag.appendChild(elem) - return frag - - def extraports_to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- for state, count in self.extraports.items(): -- elem = document.createElement(u"extraports") -- elem.setAttribute(u"state", state) -- elem.setAttribute(u"count", unicode(count)) -+ for state, count in list(self.extraports.items()): -+ elem = document.createElement("extraports") -+ elem.setAttribute("state", state) -+ elem.setAttribute("count", str(count)) - frag.appendChild(elem) - return frag - - def os_to_dom_fragment(self, document, os): - frag = document.createDocumentFragment() -- elem = document.createElement(u"osmatch") -- elem.setAttribute(u"name", os) -+ elem = document.createElement("osmatch") -+ elem.setAttribute("name", os) - frag.appendChild(elem) - return frag - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"host") -+ elem = document.createElement("host") - - if self.state is not None: - elem.appendChild(self.state_to_dom_fragment(document)) -@@ -211,13 +211,13 @@ class Host(object): - elem.appendChild(addr.to_dom_fragment(document)) - - if len(self.hostnames) > 0: -- hostnames_elem = document.createElement(u"hostnames") -+ hostnames_elem = document.createElement("hostnames") - for hostname in self.hostnames: - hostnames_elem.appendChild( - self.hostname_to_dom_fragment(document, hostname)) - elem.appendChild(hostnames_elem) - -- ports_elem = document.createElement(u"ports") -+ ports_elem = document.createElement("ports") - ports_elem.appendChild(self.extraports_to_dom_fragment(document)) - for port in sorted(self.ports.values()): - if not self.is_extraports(port.state): -@@ -226,13 +226,13 @@ class Host(object): - elem.appendChild(ports_elem) - - if len(self.os) > 0: -- os_elem = document.createElement(u"os") -+ os_elem = document.createElement("os") - for os in self.os: - os_elem.appendChild(self.os_to_dom_fragment(document, os)) - elem.appendChild(os_elem) - - if len(self.script_results) > 0: -- hostscript_elem = document.createElement(u"hostscript") -+ hostscript_elem = document.createElement("hostscript") - for sr in self.script_results: - hostscript_elem.appendChild(sr.to_dom_fragment(document)) - elem.appendChild(hostscript_elem) -@@ -246,7 +246,7 @@ class Address(object): - self.s = s - - def __eq__(self, other): -- return self.__cmp__(other) == 0 -+ return self.sort_key() == other.sort_key() - - def __ne__(self, other): - return not self.__eq__(other) -@@ -254,8 +254,8 @@ class Address(object): - def __hash__(self): - return hash(self.sort_key()) - -- def __cmp__(self, other): -- return cmp(self.sort_key(), other.sort_key()) -+ def __lt__(self, other): -+ return self.sort_key() < other.sort_key() - - def __str__(self): - return str(self.s) -@@ -264,21 +264,21 @@ class Address(object): - return self.s - - def new(type, s): -- if type == u"ipv4": -+ if type == "ipv4": - return IPv4Address(s) -- elif type == u"ipv6": -+ elif type == "ipv6": - return IPv6Address(s) -- elif type == u"mac": -+ elif type == "mac": - return MACAddress(s) - else: -- raise ValueError(u"Unknown address type %s." % type) -+ raise ValueError("Unknown address type %s." % type) - new = staticmethod(new) - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"address") -- elem.setAttribute(u"addr", self.s) -- elem.setAttribute(u"addrtype", self.type) -+ elem = document.createElement("address") -+ elem.setAttribute("addr", self.s) -+ elem.setAttribute("addrtype", self.type) - frag.appendChild(elem) - return frag - -@@ -287,21 +287,21 @@ class Address(object): - - - class IPv4Address(Address): -- type = property(lambda self: u"ipv4") -+ type = property(lambda self: "ipv4") - - def sort_key(self): - return (0, self.s) - - - class IPv6Address(Address): -- type = property(lambda self: u"ipv6") -+ type = property(lambda self: "ipv6") - - def sort_key(self): - return (1, self.s) - - - class MACAddress(Address): -- type = property(lambda self: u"mac") -+ type = property(lambda self: "mac") - - def sort_key(self): - return (2, self.s) -@@ -320,28 +320,25 @@ class Port(object): - - def state_string(self): - if self.state is None: -- return u"unknown" -+ return "unknown" - else: -- return unicode(self.state) -+ return str(self.state) - - def spec_string(self): -- return u"%d/%s" % self.spec -+ return "%d/%s" % self.spec - -- def __cmp__(self, other): -- d = cmp(self.spec, other.spec) -- if d != 0: -- return d -- return cmp((self.spec, self.service, self.script_results), -- (other.spec, other.service, other.script_results)) -+ def __lt__(self, other): -+ return (self.spec, self.service, self.script_results) < ( -+ other.spec, other.service, other.script_results) - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"port") -- elem.setAttribute(u"portid", unicode(self.spec[0])) -- elem.setAttribute(u"protocol", self.spec[1]) -+ elem = document.createElement("port") -+ elem.setAttribute("portid", str(self.spec[0])) -+ elem.setAttribute("protocol", self.spec[1]) - if self.state is not None: -- state_elem = document.createElement(u"state") -- state_elem.setAttribute(u"state", self.state) -+ state_elem = document.createElement("state") -+ state_elem.setAttribute("state", self.state) - elem.appendChild(state_elem) - elem.appendChild(self.service.to_dom_fragment(document)) - for sr in self.script_results: -@@ -385,7 +382,7 @@ class Service(object): - if len(parts) == 0: - return None - else: -- return u"/".join(parts) -+ return "/".join(parts) - - def version_string(self): - """Get a string like in the VERSION column of Nmap output.""" -@@ -395,17 +392,17 @@ class Service(object): - if self.version is not None: - parts.append(self.version) - if self.extrainfo is not None: -- parts.append(u"(%s)" % self.extrainfo) -+ parts.append("(%s)" % self.extrainfo) - - if len(parts) == 0: - return None - else: -- return u" ".join(parts) -+ return " ".join(parts) - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"service") -- for attr in (u"name", u"product", u"version", u"extrainfo", u"tunnel"): -+ elem = document.createElement("service") -+ for attr in ("name", "product", "version", "extrainfo", "tunnel"): - v = getattr(self, attr) - if v is None: - continue -@@ -435,53 +432,53 @@ class ScriptResult(object): - result = [] - lines = self.output.splitlines() - if len(lines) > 0: -- lines[0] = self.id + u": " + lines[0] -+ lines[0] = self.id + ": " + lines[0] - for line in lines[:-1]: -- result.append(u"| " + line) -+ result.append("| " + line) - if len(lines) > 0: -- result.append(u"|_ " + lines[-1]) -+ result.append("|_ " + lines[-1]) - return result - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- elem = document.createElement(u"script") -- elem.setAttribute(u"id", self.id) -- elem.setAttribute(u"output", self.output) -+ elem = document.createElement("script") -+ elem.setAttribute("id", self.id) -+ elem.setAttribute("output", self.output) - frag.appendChild(elem) - return frag - - - def format_banner(scan): - """Format a startup banner more or less like Nmap does.""" -- scanner = u"Nmap" -- if scan.scanner is not None and scan.scanner != u"nmap": -+ scanner = "Nmap" -+ if scan.scanner is not None and scan.scanner != "nmap": - scanner = scan.scanner - parts = [scanner] - if scan.version is not None: - parts.append(scan.version) -- parts.append(u"scan") -+ parts.append("scan") - if scan.start_date is not None: -- parts.append(u"initiated %s" % scan.start_date.strftime( -+ parts.append("initiated %s" % scan.start_date.strftime( - "%a %b %d %H:%M:%S %Y")) - if scan.args is not None: -- parts.append(u"as: %s" % scan.args) -- return u" ".join(parts) -+ parts.append("as: %s" % scan.args) -+ return " ".join(parts) - - - def print_script_result_diffs_text(title, script_results_a, script_results_b, - script_result_diffs, f=sys.stdout): -- table = Table(u"*") -+ table = Table("*") - for sr_diff in script_result_diffs: - sr_diff.append_to_port_table(table) - if len(table) > 0: -- print >> f -+ print(file=f) - if len(script_results_b) == 0: -- print >> f, u"-%s:" % title -+ print("-%s:" % title, file=f) - elif len(script_results_a) == 0: -- print >> f, u"+%s:" % title -+ print("+%s:" % title, file=f) - else: -- print >> f, u" %s:" % title -- print >> f, table -+ print(" %s:" % title, file=f) -+ print(table, file=f) - - - def script_result_diffs_to_dom_fragment(elem, script_results_a, -@@ -489,13 +486,13 @@ def script_result_diffs_to_dom_fragment(elem, script_results_a, - if len(script_results_a) == 0 and len(script_results_b) == 0: - return document.createDocumentFragment() - elif len(script_results_b) == 0: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - for sr in script_results_a: - elem.appendChild(sr.to_dom_fragment(document)) - a_elem.appendChild(elem) - return a_elem - elif len(script_results_a) == 0: -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - for sr in script_results_b: - elem.appendChild(sr.to_dom_fragment(document)) - b_elem.appendChild(elem) -@@ -581,10 +578,10 @@ class ScanDiffText(ScanDiff): - banner_a = format_banner(self.scan_a) - banner_b = format_banner(self.scan_b) - if banner_a != banner_b: -- print >> self.f, u"-%s" % banner_a -- print >> self.f, u"+%s" % banner_b -+ print("-%s" % banner_a, file=self.f) -+ print("+%s" % banner_b, file=self.f) - elif verbose: -- print >> self.f, u" %s" % banner_a -+ print(" %s" % banner_a, file=self.f) - - def output_pre_scripts(self, pre_script_result_diffs): - print_script_result_diffs_text("Pre-scan script results", -@@ -597,7 +594,7 @@ class ScanDiffText(ScanDiff): - post_script_result_diffs, self.f) - - def output_host_diff(self, h_diff): -- print >> self.f -+ print(file=self.f) - h_diff.print_text(self.f) - - def output_ending(self): -@@ -622,8 +619,8 @@ class ScanDiffXML(ScanDiff): - - def output_beginning(self): - self.writer.startDocument() -- self.writer.startElement(u"nmapdiff", {u"version": NDIFF_XML_VERSION}) -- self.writer.startElement(u"scandiff", {}) -+ self.writer.startElement("nmapdiff", {"version": NDIFF_XML_VERSION}) -+ self.writer.startElement("scandiff", {}) - - if self.nmaprun_differs(): - self.writer.frag_a( -@@ -636,7 +633,7 @@ class ScanDiffXML(ScanDiff): - - def output_pre_scripts(self, pre_script_result_diffs): - if len(pre_script_result_diffs) > 0 or verbose: -- prescript_elem = self.document.createElement(u"prescript") -+ prescript_elem = self.document.createElement("prescript") - frag = script_result_diffs_to_dom_fragment( - prescript_elem, self.scan_a.pre_script_results, - self.scan_b.pre_script_results, pre_script_result_diffs, -@@ -646,7 +643,7 @@ class ScanDiffXML(ScanDiff): - - def output_post_scripts(self, post_script_result_diffs): - if len(post_script_result_diffs) > 0 or verbose: -- postscript_elem = self.document.createElement(u"postscript") -+ postscript_elem = self.document.createElement("postscript") - frag = script_result_diffs_to_dom_fragment( - postscript_elem, self.scan_a.post_script_results, - self.scan_b.post_script_results, post_script_result_diffs, -@@ -660,8 +657,8 @@ class ScanDiffXML(ScanDiff): - frag.unlink() - - def output_ending(self): -- self.writer.endElement(u"scandiff") -- self.writer.endElement(u"nmapdiff") -+ self.writer.endElement("scandiff") -+ self.writer.endElement("nmapdiff") - self.writer.endDocument() - - -@@ -719,9 +716,9 @@ class HostDiff(object): - self.cost += os_cost - - extraports_a = tuple((count, state) -- for (state, count) in self.host_a.extraports.items()) -+ for (state, count) in list(self.host_a.extraports.items())) - extraports_b = tuple((count, state) -- for (state, count) in self.host_b.extraports.items()) -+ for (state, count) in list(self.host_b.extraports.items())) - if extraports_a != extraports_b: - self.extraports_changed = True - self.cost += 1 -@@ -747,69 +744,69 @@ class HostDiff(object): - # Names and addresses. - if self.id_changed: - if host_a.state is not None: -- print >> f, u"-%s:" % host_a.format_name() -+ print("-%s:" % host_a.format_name(), file=f) - if self.host_b.state is not None: -- print >> f, u"+%s:" % host_b.format_name() -+ print("+%s:" % host_b.format_name(), file=f) - else: -- print >> f, u" %s:" % host_a.format_name() -+ print(" %s:" % host_a.format_name(), file=f) - - # State. - if self.state_changed: - if host_a.state is not None: -- print >> f, u"-Host is %s." % host_a.state -+ print("-Host is %s." % host_a.state, file=f) - if host_b.state is not None: -- print >> f, u"+Host is %s." % host_b.state -+ print("+Host is %s." % host_b.state, file=f) - elif verbose: -- print >> f, u" Host is %s." % host_b.state -+ print(" Host is %s." % host_b.state, file=f) - - # Extraports. - if self.extraports_changed: - if len(host_a.extraports) > 0: -- print >> f, u"-Not shown: %s" % host_a.extraports_string() -+ print("-Not shown: %s" % host_a.extraports_string(), file=f) - if len(host_b.extraports) > 0: -- print >> f, u"+Not shown: %s" % host_b.extraports_string() -+ print("+Not shown: %s" % host_b.extraports_string(), file=f) - elif verbose: - if len(host_a.extraports) > 0: -- print >> f, u" Not shown: %s" % host_a.extraports_string() -+ print(" Not shown: %s" % host_a.extraports_string(), file=f) - - # Port table. -- port_table = Table(u"** * * *") -+ port_table = Table("** * * *") - if host_a.state is None: -- mark = u"+" -+ mark = "+" - elif host_b.state is None: -- mark = u"-" -+ mark = "-" - else: -- mark = u" " -- port_table.append((mark, u"PORT", u"STATE", u"SERVICE", u"VERSION")) -+ mark = " " -+ port_table.append((mark, "PORT", "STATE", "SERVICE", "VERSION")) - - for port in self.ports: - port_diff = self.port_diffs[port] - port_diff.append_to_port_table(port_table, host_a, host_b) - - if len(port_table) > 1: -- print >> f, port_table -+ print(port_table, file=f) - - # OS changes. - if self.os_changed or verbose: - if len(host_a.os) > 0: - if len(host_b.os) > 0: -- print >> f, u" OS details:" -+ print(" OS details:", file=f) - else: -- print >> f, u"-OS details:" -+ print("-OS details:", file=f) - elif len(host_b.os) > 0: -- print >> f, u"+OS details:" -+ print("+OS details:", file=f) - # os_diffs is a list of 5-tuples returned by - # difflib.SequenceMatcher. - for op, i1, i2, j1, j2 in self.os_diffs: - if op == "replace" or op == "delete": - for i in range(i1, i2): -- print >> f, "- %s" % host_a.os[i] -+ print("- %s" % host_a.os[i], file=f) - if op == "replace" or op == "insert": - for i in range(j1, j2): -- print >> f, "+ %s" % host_b.os[i] -+ print("+ %s" % host_b.os[i], file=f) - if op == "equal": - for i in range(i1, i2): -- print >> f, " %s" % host_a.os[i] -+ print(" %s" % host_a.os[i], file=f) - - print_script_result_diffs_text("Host script results", - host_a.script_results, host_b.script_results, -@@ -820,32 +817,32 @@ class HostDiff(object): - host_b = self.host_b - - frag = document.createDocumentFragment() -- hostdiff_elem = document.createElement(u"hostdiff") -+ hostdiff_elem = document.createElement("hostdiff") - frag.appendChild(hostdiff_elem) - - if host_a.state is None or host_b.state is None: - # The host is missing in one scan. Output the whole thing. - if host_a.state is not None: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild(host_a.to_dom_fragment(document)) - hostdiff_elem.appendChild(a_elem) - elif host_b.state is not None: -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild(host_b.to_dom_fragment(document)) - hostdiff_elem.appendChild(b_elem) - return frag - -- host_elem = document.createElement(u"host") -+ host_elem = document.createElement("host") - - # State. - if host_a.state == host_b.state: - if verbose: - host_elem.appendChild(host_a.state_to_dom_fragment(document)) - else: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild(host_a.state_to_dom_fragment(document)) - host_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild(host_b.state_to_dom_fragment(document)) - host_elem.appendChild(b_elem) - -@@ -854,31 +851,31 @@ class HostDiff(object): - addrset_b = set(host_b.addresses) - for addr in sorted(addrset_a.intersection(addrset_b)): - host_elem.appendChild(addr.to_dom_fragment(document)) -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - for addr in sorted(addrset_a - addrset_b): - a_elem.appendChild(addr.to_dom_fragment(document)) - if a_elem.hasChildNodes(): - host_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - for addr in sorted(addrset_b - addrset_a): - b_elem.appendChild(addr.to_dom_fragment(document)) - if b_elem.hasChildNodes(): - host_elem.appendChild(b_elem) - - # Host names. -- hostnames_elem = document.createElement(u"hostnames") -+ hostnames_elem = document.createElement("hostnames") - hostnameset_a = set(host_a.hostnames) - hostnameset_b = set(host_b.hostnames) - for hostname in sorted(hostnameset_a.intersection(hostnameset_b)): - hostnames_elem.appendChild( - host_a.hostname_to_dom_fragment(document, hostname)) -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - for hostname in sorted(hostnameset_a - hostnameset_b): - a_elem.appendChild( - host_a.hostname_to_dom_fragment(document, hostname)) - if a_elem.hasChildNodes(): - hostnames_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - for hostname in sorted(hostnameset_b - hostnameset_a): - b_elem.appendChild( - host_b.hostname_to_dom_fragment(document, hostname)) -@@ -887,15 +884,15 @@ class HostDiff(object): - if hostnames_elem.hasChildNodes(): - host_elem.appendChild(hostnames_elem) - -- ports_elem = document.createElement(u"ports") -+ ports_elem = document.createElement("ports") - # Extraports. - if host_a.extraports == host_b.extraports: - ports_elem.appendChild(host_a.extraports_to_dom_fragment(document)) - else: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild(host_a.extraports_to_dom_fragment(document)) - ports_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild(host_b.extraports_to_dom_fragment(document)) - ports_elem.appendChild(b_elem) - # Port list. -@@ -911,18 +908,18 @@ class HostDiff(object): - - # OS changes. - if self.os_changed or verbose: -- os_elem = document.createElement(u"os") -+ os_elem = document.createElement("os") - # os_diffs is a list of 5-tuples returned by - # difflib.SequenceMatcher. - for op, i1, i2, j1, j2 in self.os_diffs: - if op == "replace" or op == "delete": -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - for i in range(i1, i2): - a_elem.appendChild(host_a.os_to_dom_fragment( - document, host_a.os[i])) - os_elem.appendChild(a_elem) - if op == "replace" or op == "insert": -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - for i in range(j1, j2): - b_elem.appendChild(host_b.os_to_dom_fragment( - document, host_b.os[i])) -@@ -936,7 +933,7 @@ class HostDiff(object): - - # Host script changes. - if len(self.script_result_diffs) > 0 or verbose: -- hostscript_elem = document.createElement(u"hostscript") -+ hostscript_elem = document.createElement("hostscript") - host_elem.appendChild(script_result_diffs_to_dom_fragment( - hostscript_elem, host_a.script_results, - host_b.script_results, self.script_result_diffs, -@@ -989,38 +986,38 @@ class PortDiff(object): - self.port_b.service.version_string()] - if a_columns == b_columns: - if verbose or self.script_result_diffs > 0: -- table.append([u" "] + a_columns) -+ table.append([" "] + a_columns) - else: - if not host_a.is_extraports(self.port_a.state): -- table.append([u"-"] + a_columns) -+ table.append(["-"] + a_columns) - if not host_b.is_extraports(self.port_b.state): -- table.append([u"+"] + b_columns) -+ table.append(["+"] + b_columns) - - for sr_diff in self.script_result_diffs: - sr_diff.append_to_port_table(table) - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -- portdiff_elem = document.createElement(u"portdiff") -+ portdiff_elem = document.createElement("portdiff") - frag.appendChild(portdiff_elem) - if (self.port_a.spec == self.port_b.spec and - self.port_a.state == self.port_b.state): -- port_elem = document.createElement(u"port") -- port_elem.setAttribute(u"portid", unicode(self.port_a.spec[0])) -- port_elem.setAttribute(u"protocol", self.port_a.spec[1]) -+ port_elem = document.createElement("port") -+ port_elem.setAttribute("portid", str(self.port_a.spec[0])) -+ port_elem.setAttribute("protocol", self.port_a.spec[1]) - if self.port_a.state is not None: -- state_elem = document.createElement(u"state") -- state_elem.setAttribute(u"state", self.port_a.state) -+ state_elem = document.createElement("state") -+ state_elem.setAttribute("state", self.port_a.state) - port_elem.appendChild(state_elem) - if self.port_a.service == self.port_b.service: - port_elem.appendChild( - self.port_a.service.to_dom_fragment(document)) - else: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild( - self.port_a.service.to_dom_fragment(document)) - port_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild( - self.port_b.service.to_dom_fragment(document)) - port_elem.appendChild(b_elem) -@@ -1028,10 +1025,10 @@ class PortDiff(object): - port_elem.appendChild(sr_diff.to_dom_fragment(document)) - portdiff_elem.appendChild(port_elem) - else: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild(self.port_a.to_dom_fragment(document)) - portdiff_elem.appendChild(a_elem) -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild(self.port_b.to_dom_fragment(document)) - portdiff_elem.appendChild(b_elem) - -@@ -1086,13 +1083,13 @@ class ScriptResultDiff(object): - for op, i1, i2, j1, j2 in diffs.get_opcodes(): - if op == "replace" or op == "delete": - for k in range(i1, i2): -- table.append_raw(u"-" + a_lines[k]) -+ table.append_raw("-" + a_lines[k]) - if op == "replace" or op == "insert": - for k in range(j1, j2): -- table.append_raw(u"+" + b_lines[k]) -+ table.append_raw("+" + b_lines[k]) - if op == "equal": - for k in range(i1, i2): -- table.append_raw(u" " + a_lines[k]) -+ table.append_raw(" " + a_lines[k]) - - def to_dom_fragment(self, document): - frag = document.createDocumentFragment() -@@ -1102,11 +1099,11 @@ class ScriptResultDiff(object): - frag.appendChild(self.sr_a.to_dom_fragment(document)) - else: - if self.sr_a is not None: -- a_elem = document.createElement(u"a") -+ a_elem = document.createElement("a") - a_elem.appendChild(self.sr_a.to_dom_fragment(document)) - frag.appendChild(a_elem) - if self.sr_b is not None: -- b_elem = document.createElement(u"b") -+ b_elem = document.createElement("b") - b_elem.appendChild(self.sr_b.to_dom_fragment(document)) - frag.appendChild(b_elem) - return frag -@@ -1120,7 +1117,7 @@ class Table(object): - copied to the output.""" - self.widths = [] - self.rows = [] -- self.prefix = u"" -+ self.prefix = "" - self.padding = [] - j = 0 - while j < len(template) and template[j] != "*": -@@ -1145,7 +1142,7 @@ class Table(object): - - for i in range(len(row)): - if row[i] is None: -- s = u"" -+ s = "" - else: - s = str(row[i]) - if i == len(self.widths): -@@ -1167,7 +1164,7 @@ class Table(object): - for row in self.rows: - parts = [self.prefix] - i = 0 -- if isinstance(row, basestring): -+ if isinstance(row, str): - # A raw string. - lines.append(row) - else: -@@ -1176,13 +1173,13 @@ class Table(object): - if i < len(self.padding): - parts.append(self.padding[i]) - i += 1 -- lines.append(u"".join(parts).rstrip()) -- return u"\n".join(lines) -+ lines.append("".join(parts).rstrip()) -+ return "\n".join(lines) - - - def warn(str): - """Print a warning to stderr.""" -- print >> sys.stderr, str -+ print(str, file=sys.stderr) - - - class NmapContentHandler(xml.sax.handler.ContentHandler): -@@ -1200,22 +1197,22 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): - self.current_port = None - - self._start_elem_handlers = { -- u"nmaprun": self._start_nmaprun, -- u"host": self._start_host, -- u"status": self._start_status, -- u"address": self._start_address, -- u"hostname": self._start_hostname, -- u"extraports": self._start_extraports, -- u"port": self._start_port, -- u"state": self._start_state, -- u"service": self._start_service, -- u"script": self._start_script, -- u"osmatch": self._start_osmatch, -- u"finished": self._start_finished, -+ "nmaprun": self._start_nmaprun, -+ "host": self._start_host, -+ "status": self._start_status, -+ "address": self._start_address, -+ "hostname": self._start_hostname, -+ "extraports": self._start_extraports, -+ "port": self._start_port, -+ "state": self._start_state, -+ "service": self._start_service, -+ "script": self._start_script, -+ "osmatch": self._start_osmatch, -+ "finished": self._start_finished, - } - self._end_elem_handlers = { -- u'host': self._end_host, -- u'port': self._end_port, -+ 'host': self._end_host, -+ 'port': self._end_port, - } - - def parent_element(self): -@@ -1245,68 +1242,68 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): - def _start_nmaprun(self, name, attrs): - assert self.parent_element() is None - if "start" in attrs: -- start_timestamp = int(attrs.get(u"start")) -+ start_timestamp = int(attrs.get("start")) - self.scan.start_date = datetime.datetime.fromtimestamp( - start_timestamp) -- self.scan.scanner = attrs.get(u"scanner") -- self.scan.args = attrs.get(u"args") -- self.scan.version = attrs.get(u"version") -+ self.scan.scanner = attrs.get("scanner") -+ self.scan.args = attrs.get("args") -+ self.scan.version = attrs.get("version") - - def _start_host(self, name, attrs): -- assert self.parent_element() == u"nmaprun" -+ assert self.parent_element() == "nmaprun" - self.current_host = Host() - self.scan.hosts.append(self.current_host) - - def _start_status(self, name, attrs): -- assert self.parent_element() == u"host" -+ assert self.parent_element() == "host" - assert self.current_host is not None -- state = attrs.get(u"state") -+ state = attrs.get("state") - if state is None: - warn(u'%s element of host %s is missing the "state" attribute; ' -- 'assuming \unknown\.' % ( -+ r'assuming \unknown\.' % ( - name, self.current_host.format_name())) - return - self.current_host.state = state - - def _start_address(self, name, attrs): -- assert self.parent_element() == u"host" -+ assert self.parent_element() == "host" - assert self.current_host is not None -- addr = attrs.get(u"addr") -+ addr = attrs.get("addr") - if addr is None: -- warn(u'%s element of host %s is missing the "addr" ' -+ warn('%s element of host %s is missing the "addr" ' - 'attribute; skipping.' % ( - name, self.current_host.format_name())) - return -- addrtype = attrs.get(u"addrtype", u"ipv4") -+ addrtype = attrs.get("addrtype", "ipv4") - self.current_host.add_address(Address.new(addrtype, addr)) - - def _start_hostname(self, name, attrs): -- assert self.parent_element() == u"hostnames" -+ assert self.parent_element() == "hostnames" - assert self.current_host is not None -- hostname = attrs.get(u"name") -+ hostname = attrs.get("name") - if hostname is None: -- warn(u'%s element of host %s is missing the "name" ' -+ warn('%s element of host %s is missing the "name" ' - 'attribute; skipping.' % ( - name, self.current_host.format_name())) - return - self.current_host.add_hostname(hostname) - - def _start_extraports(self, name, attrs): -- assert self.parent_element() == u"ports" -+ assert self.parent_element() == "ports" - assert self.current_host is not None -- state = attrs.get(u"state") -+ state = attrs.get("state") - if state is None: -- warn(u'%s element of host %s is missing the "state" ' -+ warn('%s element of host %s is missing the "state" ' - 'attribute; assuming "unknown".' % ( - name, self.current_host.format_name())) - state = None - if state in self.current_host.extraports: -- warn(u'Duplicate extraports state "%s" in host %s.' % ( -+ warn('Duplicate extraports state "%s" in host %s.' % ( - state, self.current_host.format_name())) - -- count = attrs.get(u"count") -+ count = attrs.get("count") - if count is None: -- warn(u'%s element of host %s is missing the "count" ' -+ warn('%s element of host %s is missing the "count" ' - 'attribute; assuming 0.' % ( - name, self.current_host.format_name())) - count = 0 -@@ -1314,99 +1311,99 @@ class NmapContentHandler(xml.sax.handler.ContentHandler): - try: - count = int(count) - except ValueError: -- warn(u"Can't convert extraports count \"%s\" " -+ warn("Can't convert extraports count \"%s\" " - "to an integer in host %s; assuming 0." % ( -- attrs[u"count"], self.current_host.format_name())) -+ attrs["count"], self.current_host.format_name())) - count = 0 - self.current_host.extraports[state] = count - - def _start_port(self, name, attrs): -- assert self.parent_element() == u"ports" -+ assert self.parent_element() == "ports" - assert self.current_host is not None -- portid_str = attrs.get(u"portid") -+ portid_str = attrs.get("portid") - if portid_str is None: -- warn(u'%s element of host %s missing the "portid" ' -+ warn('%s element of host %s missing the "portid" ' - 'attribute; skipping.' % ( - name, self.current_host.format_name())) - return - try: - portid = int(portid_str) - except ValueError: -- warn(u"Can't convert portid \"%s\" to an integer " -+ warn("Can't convert portid \"%s\" to an integer " - "in host %s; skipping port." % ( - portid_str, self.current_host.format_name())) - return -- protocol = attrs.get(u"protocol") -+ protocol = attrs.get("protocol") - if protocol is None: -- warn(u'%s element of host %s missing the "protocol" ' -+ warn('%s element of host %s missing the "protocol" ' - 'attribute; skipping.' % ( - name, self.current_host.format_name())) - return - self.current_port = Port((portid, protocol)) - - def _start_state(self, name, attrs): -- assert self.parent_element() == u"port" -+ assert self.parent_element() == "port" - assert self.current_host is not None - if self.current_port is None: - return - if "state" not in attrs: -- warn(u'%s element of port %s is missing the "state" ' -+ warn('%s element of port %s is missing the "state" ' - 'attribute; assuming "unknown".' % ( - name, self.current_port.spec_string())) - return -- self.current_port.state = attrs[u"state"] -+ self.current_port.state = attrs["state"] - self.current_host.add_port(self.current_port) - - def _start_service(self, name, attrs): -- assert self.parent_element() == u"port" -+ assert self.parent_element() == "port" - assert self.current_host is not None - if self.current_port is None: - return -- self.current_port.service.name = attrs.get(u"name") -- self.current_port.service.product = attrs.get(u"product") -- self.current_port.service.version = attrs.get(u"version") -- self.current_port.service.extrainfo = attrs.get(u"extrainfo") -- self.current_port.service.tunnel = attrs.get(u"tunnel") -+ self.current_port.service.name = attrs.get("name") -+ self.current_port.service.product = attrs.get("product") -+ self.current_port.service.version = attrs.get("version") -+ self.current_port.service.extrainfo = attrs.get("extrainfo") -+ self.current_port.service.tunnel = attrs.get("tunnel") - - def _start_script(self, name, attrs): - result = ScriptResult() -- result.id = attrs.get(u"id") -+ result.id = attrs.get("id") - if result.id is None: -- warn(u'%s element missing the "id" attribute; skipping.' % name) -+ warn('%s element missing the "id" attribute; skipping.' % name) - return - -- result.output = attrs.get(u"output") -+ result.output = attrs.get("output") - if result.output is None: -- warn(u'%s element missing the "output" attribute; skipping.' -+ warn('%s element missing the "output" attribute; skipping.' - % name) - return -- if self.parent_element() == u"prescript": -+ if self.parent_element() == "prescript": - self.scan.pre_script_results.append(result) -- elif self.parent_element() == u"postscript": -+ elif self.parent_element() == "postscript": - self.scan.post_script_results.append(result) -- elif self.parent_element() == u"hostscript": -+ elif self.parent_element() == "hostscript": - self.current_host.script_results.append(result) -- elif self.parent_element() == u"port": -+ elif self.parent_element() == "port": - self.current_port.script_results.append(result) - else: -- warn(u"%s element not inside prescript, postscript, hostscript, " -+ warn("%s element not inside prescript, postscript, hostscript, " - "or port element; ignoring." % name) - return - - def _start_osmatch(self, name, attrs): -- assert self.parent_element() == u"os" -+ assert self.parent_element() == "os" - assert self.current_host is not None - if "name" not in attrs: -- warn(u'%s element of host %s is missing the "name" ' -+ warn('%s element of host %s is missing the "name" ' - 'attribute; skipping.' % ( - name, self.current_host.format_name())) - return -- self.current_host.os.append(attrs[u"name"]) -+ self.current_host.os.append(attrs["name"]) - - def _start_finished(self, name, attrs): -- assert self.parent_element() == u"runstats" -+ assert self.parent_element() == "runstats" - if "time" in attrs: -- end_timestamp = int(attrs.get(u"time")) -+ end_timestamp = int(attrs.get("time")) - self.scan.end_date = datetime.datetime.fromtimestamp(end_timestamp) - - def _end_host(self, name): -@@ -1425,23 +1422,23 @@ class XMLWriter (xml.sax.saxutils.XMLGenerator): - - def frag(self, frag): - for node in frag.childNodes: -- node.writexml(self.f, newl=u"\n") -+ node.writexml(self.f, newl="\n") - - def frag_a(self, frag): -- self.startElement(u"a", {}) -+ self.startElement("a", {}) - for node in frag.childNodes: -- node.writexml(self.f, newl=u"\n") -- self.endElement(u"a") -+ node.writexml(self.f, newl="\n") -+ self.endElement("a") - - def frag_b(self, frag): -- self.startElement(u"b", {}) -+ self.startElement("b", {}) - for node in frag.childNodes: -- node.writexml(self.f, newl=u"\n") -- self.endElement(u"b") -+ node.writexml(self.f, newl="\n") -+ self.endElement("b") - - - def usage(): -- print u"""\ -+ print("""\ - Usage: %s [option] FILE1 FILE2 - Compare two Nmap XML files and display a list of their differences. - Differences include host state changes, port state changes, and changes to -@@ -1451,7 +1448,7 @@ service and OS detection. - -v, --verbose also show hosts and ports that haven't changed. - --text display output in text format (default) - --xml display output in XML format\ --""" % sys.argv[0] -+""" % sys.argv[0]) - - EXIT_EQUAL = 0 - EXIT_DIFFERENT = 1 -@@ -1459,8 +1456,8 @@ EXIT_ERROR = 2 - - - def usage_error(msg): -- print >> sys.stderr, u"%s: %s" % (sys.argv[0], msg) -- print >> sys.stderr, u"Try '%s -h' for help." % sys.argv[0] -+ print("%s: %s" % (sys.argv[0], msg), file=sys.stderr) -+ print("Try '%s -h' for help." % sys.argv[0], file=sys.stderr) - sys.exit(EXIT_ERROR) - - -@@ -1471,7 +1468,7 @@ def main(): - try: - opts, input_filenames = getopt.gnu_getopt( - sys.argv[1:], "hv", ["help", "text", "verbose", "xml"]) -- except getopt.GetoptError, e: -+ except getopt.GetoptError as e: - usage_error(e.msg) - for o, a in opts: - if o == "-h" or o == "--help": -@@ -1481,15 +1478,15 @@ def main(): - verbose = True - elif o == "--text": - if output_format is not None and output_format != "text": -- usage_error(u"contradictory output format options.") -+ usage_error("contradictory output format options.") - output_format = "text" - elif o == "--xml": - if output_format is not None and output_format != "xml": -- usage_error(u"contradictory output format options.") -+ usage_error("contradictory output format options.") - output_format = "xml" - - if len(input_filenames) != 2: -- usage_error(u"need exactly two input filenames.") -+ usage_error("need exactly two input filenames.") - - if output_format is None: - output_format = "text" -@@ -1502,8 +1499,8 @@ def main(): - scan_a.load_from_file(filename_a) - scan_b = Scan() - scan_b.load_from_file(filename_b) -- except IOError, e: -- print >> sys.stderr, u"Can't open file: %s" % str(e) -+ except IOError as e: -+ print("Can't open file: %s" % str(e), file=sys.stderr) - sys.exit(EXIT_ERROR) - - if output_format == "text": -diff --git a/ndiff/ndifftest.py b/ndiff/ndifftest.py -index 2fa4ae0..27fc525 100755 ---- a/ndiff/ndifftest.py -+++ b/ndiff/ndifftest.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Unit tests for Ndiff. - -@@ -22,7 +22,7 @@ for x in dir(ndiff): - sys.dont_write_bytecode = dont_write_bytecode - del dont_write_bytecode - --import StringIO -+import io - - - class scan_test(unittest.TestCase): -@@ -52,7 +52,7 @@ class scan_test(unittest.TestCase): - scan.load_from_file("test-scans/single.xml") - host = scan.hosts[0] - self.assertEqual(len(host.ports), 5) -- self.assertEqual(host.extraports.items(), [("filtered", 95)]) -+ self.assertEqual(list(host.extraports.items()), [("filtered", 95)]) - - def test_extraports_multi(self): - """Test that the correct number of known ports is returned when there -@@ -68,9 +68,9 @@ class scan_test(unittest.TestCase): - """Test that nmaprun information is recorded.""" - scan = Scan() - scan.load_from_file("test-scans/empty.xml") -- self.assertEqual(scan.scanner, u"nmap") -- self.assertEqual(scan.version, u"4.90RC2") -- self.assertEqual(scan.args, u"nmap -oX empty.xml -p 1-100") -+ self.assertEqual(scan.scanner, "nmap") -+ self.assertEqual(scan.version, "4.90RC2") -+ self.assertEqual(scan.args, "nmap -oX empty.xml -p 1-100") - - def test_addresses(self): - """Test that addresses are recorded.""" -@@ -84,7 +84,7 @@ class scan_test(unittest.TestCase): - scan = Scan() - scan.load_from_file("test-scans/simple.xml") - host = scan.hosts[0] -- self.assertEqual(host.hostnames, [u"scanme.nmap.org"]) -+ self.assertEqual(host.hostnames, ["scanme.nmap.org"]) - - def test_os(self): - """Test that OS information is recorded.""" -@@ -99,7 +99,7 @@ class scan_test(unittest.TestCase): - scan.load_from_file("test-scans/complex.xml") - host = scan.hosts[0] - self.assertTrue(len(host.script_results) > 0) -- self.assertTrue(len(host.ports[(22, u"tcp")].script_results) > 0) -+ self.assertTrue(len(host.ports[(22, "tcp")].script_results) > 0) - - # This test is commented out because Nmap XML doesn't store any information - # about down hosts, not even the fact that they are down. Recovering the list -@@ -128,16 +128,16 @@ class host_test(unittest.TestCase): - - def test_format_name(self): - h = Host() -- self.assertTrue(isinstance(h.format_name(), basestring)) -- h.add_address(IPv4Address(u"127.0.0.1")) -- self.assertTrue(u"127.0.0.1" in h.format_name()) -+ self.assertTrue(isinstance(h.format_name(), str)) -+ h.add_address(IPv4Address("127.0.0.1")) -+ self.assertTrue("127.0.0.1" in h.format_name()) - h.add_address(IPv6Address("::1")) -- self.assertTrue(u"127.0.0.1" in h.format_name()) -- self.assertTrue(u"::1" in h.format_name()) -- h.add_hostname(u"localhost") -- self.assertTrue(u"127.0.0.1" in h.format_name()) -- self.assertTrue(u"::1" in h.format_name()) -- self.assertTrue(u"localhost" in h.format_name()) -+ self.assertTrue("127.0.0.1" in h.format_name()) -+ self.assertTrue("::1" in h.format_name()) -+ h.add_hostname("localhost") -+ self.assertTrue("127.0.0.1" in h.format_name()) -+ self.assertTrue("::1" in h.format_name()) -+ self.assertTrue("localhost" in h.format_name()) - - def test_empty_get_port(self): - h = Host() -@@ -197,8 +197,8 @@ class host_test(unittest.TestCase): - h = s.hosts[0] - self.assertEqual(len(h.ports), 5) - self.assertEqual(len(h.extraports), 1) -- self.assertEqual(h.extraports.keys()[0], u"filtered") -- self.assertEqual(h.extraports.values()[0], 95) -+ self.assertEqual(list(h.extraports.keys())[0], "filtered") -+ self.assertEqual(list(h.extraports.values())[0], 95) - self.assertEqual(h.state, "up") - - -@@ -241,13 +241,13 @@ class port_test(unittest.TestCase): - """Test the Port class.""" - def test_spec_string(self): - p = Port((10, "tcp")) -- self.assertEqual(p.spec_string(), u"10/tcp") -+ self.assertEqual(p.spec_string(), "10/tcp") - p = Port((100, "ip")) -- self.assertEqual(p.spec_string(), u"100/ip") -+ self.assertEqual(p.spec_string(), "100/ip") - - def test_state_string(self): - p = Port((10, "tcp")) -- self.assertEqual(p.state_string(), u"unknown") -+ self.assertEqual(p.state_string(), "unknown") - - - class service_test(unittest.TestCase): -@@ -255,47 +255,47 @@ class service_test(unittest.TestCase): - def test_compare(self): - """Test that services with the same contents compare equal.""" - a = Service() -- a.name = u"ftp" -- a.product = u"FooBar FTP" -- a.version = u"1.1.1" -- a.tunnel = u"ssl" -+ a.name = "ftp" -+ a.product = "FooBar FTP" -+ a.version = "1.1.1" -+ a.tunnel = "ssl" - self.assertEqual(a, a) - b = Service() -- b.name = u"ftp" -- b.product = u"FooBar FTP" -- b.version = u"1.1.1" -- b.tunnel = u"ssl" -+ b.name = "ftp" -+ b.product = "FooBar FTP" -+ b.version = "1.1.1" -+ b.tunnel = "ssl" - self.assertEqual(a, b) -- b.name = u"http" -+ b.name = "http" - self.assertNotEqual(a, b) - c = Service() - self.assertNotEqual(a, c) - - def test_tunnel(self): - serv = Service() -- serv.name = u"http" -- serv.tunnel = u"ssl" -- self.assertEqual(serv.name_string(), u"ssl/http") -+ serv.name = "http" -+ serv.tunnel = "ssl" -+ self.assertEqual(serv.name_string(), "ssl/http") - - def test_version_string(self): - serv = Service() -- serv.product = u"FooBar" -+ serv.product = "FooBar" - self.assertTrue(len(serv.version_string()) > 0) - serv = Service() -- serv.version = u"1.2.3" -+ serv.version = "1.2.3" - self.assertTrue(len(serv.version_string()) > 0) - serv = Service() -- serv.extrainfo = u"misconfigured" -+ serv.extrainfo = "misconfigured" - self.assertTrue(len(serv.version_string()) > 0) - serv = Service() -- serv.product = u"FooBar" -- serv.version = u"1.2.3" -+ serv.product = "FooBar" -+ serv.version = "1.2.3" - # Must match Nmap output. - self.assertEqual(serv.version_string(), -- u"%s %s" % (serv.product, serv.version)) -- serv.extrainfo = u"misconfigured" -+ "%s %s" % (serv.product, serv.version)) -+ serv.extrainfo = "misconfigured" - self.assertEqual(serv.version_string(), -- u"%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) -+ "%s %s (%s)" % (serv.product, serv.version, serv.extrainfo)) - - - class ScanDiffSub(ScanDiff): -@@ -703,7 +703,7 @@ class scan_diff_xml_test(unittest.TestCase): - a.load_from_file("test-scans/empty.xml") - b = Scan() - b.load_from_file("test-scans/simple.xml") -- f = StringIO.StringIO() -+ f = io.StringIO() - self.scan_diff = ScanDiffXML(a, b, f) - self.scan_diff.output() - self.xml = f.getvalue() -@@ -712,8 +712,8 @@ class scan_diff_xml_test(unittest.TestCase): - def test_well_formed(self): - try: - document = xml.dom.minidom.parseString(self.xml) -- except Exception, e: -- self.fail(u"Parsing XML diff output caused the exception: %s" -+ except Exception as e: -+ self.fail("Parsing XML diff output caused the exception: %s" - % str(e)) - - -@@ -739,8 +739,8 @@ def host_apply_diff(host, diff): - host.os = diff.host_b.os[:] - - if diff.extraports_changed: -- for state in host.extraports.keys(): -- for port in host.ports.values(): -+ for state in list(host.extraports.keys()): -+ for port in list(host.ports.values()): - if port.state == state: - del host.ports[port.spec] - host.extraports = diff.host_b.extraports.copy() -diff --git a/ndiff/scripts/ndiff b/ndiff/scripts/ndiff -index 8517c07..4671e73 100755 ---- a/ndiff/scripts/ndiff -+++ b/ndiff/scripts/ndiff -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Ndiff - # -@@ -67,15 +67,15 @@ if INSTALL_LIB is not None and is_secure_dir(INSTALL_LIB): - - try: - import ndiff --except ImportError, e: -- print >> sys.stderr, """\ -+except ImportError as e: -+ print("""\ - Could not import the ndiff module: %s. --I checked in these directories:""" % repr(e.message) -+I checked in these directories:""" % repr(e), file=sys.stderr) - for dir in sys.path: -- print >> sys.stderr, " %s" % dir -- print >> sys.stderr, """\ -+ print(" %s" % dir, file=sys.stderr) -+ print("""\ - If you installed Ndiff in another directory, you may have to add the --modules directory to the PYTHONPATH environment variable.""" -+modules directory to the PYTHONPATH environment variable.""", file=sys.stderr) - sys.exit(1) - - import ndiff -diff --git a/ndiff/setup.py b/ndiff/setup.py -old mode 100644 -new mode 100755 -index b5e254c..c49bcf3 ---- a/ndiff/setup.py -+++ b/ndiff/setup.py -@@ -94,7 +94,7 @@ class checked_install(distutils.command.install.install): - self.saved_prefix = sys.prefix - try: - distutils.command.install.install.finalize_options(self) -- except distutils.errors.DistutilsPlatformError, e: -+ except distutils.errors.DistutilsPlatformError as e: - raise distutils.errors.DistutilsPlatformError(str(e) + """ - Installing your distribution's python-dev package may solve this problem.""") - -@@ -155,13 +155,13 @@ Installing your distribution's python-dev package may solve this problem.""") - #!/usr/bin/env python - import errno, os, os.path, sys - --print 'Uninstall %(name)s' -+print('Uninstall %(name)s') - - answer = raw_input('Are you sure that you want to uninstall ' - '%(name)s (yes/no) ') - - if answer != 'yes' and answer != 'y': -- print 'Not uninstalling.' -+ print('Not uninstalling.') - sys.exit(0) - - """ % {'name': APP_NAME} -@@ -177,8 +177,8 @@ if answer != 'yes' and answer != 'y': - # This should never happen (everything gets installed - # inside the root), but if it does, be safe and don't - # delete anything. -- uninstaller += ("print '%s was not installed inside " -- "the root %s; skipping.'\n" % (output, self.root)) -+ uninstaller += ("print('%s was not installed inside " -+ "the root %s; skipping.')\n" % (output, self.root)) - continue - output = path_strip_prefix(output, self.root) - assert os.path.isabs(output) -@@ -202,24 +202,24 @@ for path in INSTALLED_FILES: - dirs.append(path) - # Delete the files. - for file in files: -- print "Removing '%s'." % file -+ print("Removing '%s'." % file) - try: - os.remove(file) -- except OSError, e: -- print >> sys.stderr, ' Error: %s.' % str(e) -+ except OSError as e: -+ print(' Error: %s.' % str(e), file=sys.stderr) - # Delete the directories. First reverse-sort the normalized paths by - # length so that child directories are deleted before their parents. - dirs = [os.path.normpath(dir) for dir in dirs] - dirs.sort(key = len, reverse = True) - for dir in dirs: - try: -- print "Removing the directory '%s'." % dir -+ print("Removing the directory '%s'." % dir) - os.rmdir(dir) -- except OSError, e: -+ except OSError as e: - if e.errno == errno.ENOTEMPTY: -- print "Directory '%s' not empty; not removing." % dir -+ print("Directory '%s' not empty; not removing." % dir) - else: -- print >> sys.stderr, str(e) -+ print(str(e), file=sys.stderr) - """ - - uninstaller_file = open(uninstaller_filename, 'w') -@@ -227,7 +227,7 @@ for dir in dirs: - uninstaller_file.close() - - # Set exec bit for uninstaller -- mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0555) & 07777 -+ mode = ((os.stat(uninstaller_filename)[ST_MODE]) | 0o555) & 0o7777 - os.chmod(uninstaller_filename, mode) - - def write_installed_files(self): -@@ -242,7 +242,7 @@ for dir in dirs: - try: - for output in self.get_installed_files(): - assert "\n" not in output -- print >> f, output -+ print(output, file=f) - finally: - f.close() - -@@ -266,7 +266,7 @@ class my_uninstall(distutils.cmd.Command): - # Read the list of installed files. - try: - f = open(INSTALLED_FILES_NAME, "r") -- except IOError, e: -+ except IOError as e: - if e.errno == errno.ENOENT: - log.error("Couldn't open the installation record '%s'. " - "Have you installed yet?" % INSTALLED_FILES_NAME) -@@ -289,7 +289,7 @@ class my_uninstall(distutils.cmd.Command): - try: - if not self.dry_run: - os.remove(file) -- except OSError, e: -+ except OSError as e: - log.error(str(e)) - # Delete the directories. First reverse-sort the normalized paths by - # length so that child directories are deleted before their parents. -@@ -300,7 +300,7 @@ class my_uninstall(distutils.cmd.Command): - log.info("Removing the directory '%s'." % dir) - if not self.dry_run: - os.rmdir(dir) -- except OSError, e: -+ except OSError as e: - if e.errno == errno.ENOTEMPTY: - log.info("Directory '%s' not empty; not removing." % dir) - else: -diff --git a/ndiff/test-scans/anonymize.py b/ndiff/test-scans/anonymize.py -index 9ba612a..fd251fe 100755 ---- a/ndiff/test-scans/anonymize.py -+++ b/ndiff/test-scans/anonymize.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - - # Anonymize an Nmap XML file, replacing host name and IP addresses with random - # anonymous ones. Anonymized names will be consistent between runs of the -@@ -20,20 +20,20 @@ r = random.Random() - - - def hash(s): -- digest = hashlib.sha512(s).hexdigest() -+ digest = hashlib.sha512(s.encode()).hexdigest() - return int(digest, 16) - - - def anonymize_mac_address(addr): - r.seed(hash(addr)) - nums = (0, 0, 0) + tuple(r.randrange(256) for i in range(3)) -- return u":".join(u"%02X" % x for x in nums) -+ return ":".join("%02X" % x for x in nums) - - - def anonymize_ipv4_address(addr): - r.seed(hash(addr)) - nums = (10,) + tuple(r.randrange(256) for i in range(3)) -- return u".".join(unicode(x) for x in nums) -+ return ".".join(str(x) for x in nums) - - - def anonymize_ipv6_address(addr): -@@ -41,7 +41,7 @@ def anonymize_ipv6_address(addr): - # RFC 4193. - nums = (0xFD00 + r.randrange(256),) - nums = nums + tuple(r.randrange(65536) for i in range(7)) -- return u":".join("%04X" % x for x in nums) -+ return ":".join("%04X" % x for x in nums) - - # Maps to memoize address and host name conversions. - hostname_map = {} -@@ -54,11 +54,11 @@ def anonymize_hostname(name): - LETTERS = "acbdefghijklmnopqrstuvwxyz" - r.seed(hash(name)) - length = r.randrange(5, 10) -- prefix = u"".join(r.sample(LETTERS, length)) -+ prefix = "".join(r.sample(LETTERS, length)) - num = r.randrange(1000) -- hostname_map[name] = u"%s-%d.example.com" % (prefix, num) -+ hostname_map[name] = "%s-%d.example.com" % (prefix, num) - if VERBOSE: -- print >> sys.stderr, "Replace %s with %s" % (name, hostname_map[name]) -+ print("Replace %s with %s" % (name, hostname_map[name]), file=sys.stderr) - return hostname_map[name] - - mac_re = re.compile(r'\b([0-9a-fA-F]{2}:){5}[0-9a-fA-F]{2}\b') -@@ -78,7 +78,7 @@ def anonymize_address(addr): - else: - assert False - if VERBOSE: -- print >> sys.stderr, "Replace %s with %s" % (addr, address_map[addr]) -+ print("Replace %s with %s" % (addr, address_map[addr]), file=sys.stderr) - return address_map[addr] - - --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch deleted file mode 100644 index c43ff9f4d8..0000000000 --- a/meta-openembedded/meta-oe/recipes-security/nmap/files/0001-configure.ac-make-ndiff-depend-on-python3.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 562893e665a6c9e1b60c8b3242bab6fe78318b3b Mon Sep 17 00:00:00 2001 -From: Mingli Yu <mingli.yu@windriver.com> -Date: Fri, 14 Feb 2020 08:19:54 +0000 -Subject: [PATCH] configure.ac: make ndiff depend on python3 - -Python 2 ceased being maintained on the 1st January 2020. -We've already removed all users of it from oe-core, so -let ndiff depend on python3. - -Upstream-Status: Pending - -Signed-off-by: Mingli Yu <mingli.yu@windriver.com> ---- - .../nmap/7.80-r0/nmap-7.80/configure.ac | 11 ++++++++--- - 1 file changed, 8 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9d2fff8..5ffdd55 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -237,16 +237,21 @@ if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x2"; then - HAVE_PYTHON2=true - fi - -+HAVE_PYTHON3=false -+if test $HAVE_PYTHON && test "x${PYTHON_VERSION%%.*}" = "x3"; then -+ HAVE_PYTHON3=true -+fi -+ - NDIFFDIR=ndiff - - # Do they want Ndiff? - AC_ARG_WITH(ndiff, AC_HELP_STRING([--without-ndiff], [Skip installation of the Ndiff utility]), [], [with_ndiff=check]) --if $HAVE_PYTHON2 ; then : ; -+if $HAVE_PYTHON3 ; then : ; - else - if test "$with_ndiff" = "check" ; then -- AC_MSG_WARN([Not building Ndiff because Python 2.x with x>=4 was not found]) -+ AC_MSG_WARN([Not building Ndiff because Python3 was not found]) - elif test "$with_ndiff" = "yes"; then -- AC_MSG_FAILURE([--with-ndiff requires Python 2.x with x>=4]) -+ AC_MSG_FAILURE([--with-ndiff requires Python3]) - fi - with_ndiff=no - fi --- -2.24.1 - diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch new file mode 100644 index 0000000000..bcb04250bb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch @@ -0,0 +1,165 @@ +From 364d089250d1acf459e9e8580161e7bb06268106 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Tue, 15 Oct 2024 02:47:38 +0000 +Subject: [PATCH] Fix off-by-one overflow in the IP protocol table. + +Fixes #2896, closes #2897, closes #2900 + +Upstream-Status: Backport [https://github.com/nmap/nmap/commit/efa0dc36f2ecade6ba8d2ed25dd4d5fbffdea308] + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + CHANGELOG | 3 +++ + portlist.cc | 8 ++++---- + protocols.cc | 6 +++--- + protocols.h | 2 ++ + scan_lists.cc | 10 +++++----- + 5 files changed, 17 insertions(+), 12 deletions(-) + +diff --git a/CHANGELOG b/CHANGELOG +index f01262c..5b204bd 100644 +--- a/CHANGELOG ++++ b/CHANGELOG +@@ -1,5 +1,8 @@ + #Nmap Changelog ($Id: CHANGELOG 38849 2024-04-18 17:16:42Z dmiller $); -*-text-*- + ++o [GH#2900, GH#2896, GH#2897] Nmap is now able to scan IP protocol 255. ++ [nnposter] ++ + Nmap 7.95 [2024-04-19] + + o [Windows] Upgraded Npcap (our Windows raw packet capturing and +diff --git a/portlist.cc b/portlist.cc +index 8258853..cd08437 100644 +--- a/portlist.cc ++++ b/portlist.cc +@@ -480,7 +480,7 @@ void PortList::setPortState(u16 portno, u8 protocol, int state, int *oldstate) { + state != PORT_CLOSEDFILTERED) + fatal("%s: attempt to add port number %d with illegal state %d\n", __func__, portno, state); + +- assert(protocol!=IPPROTO_IP || portno<256); ++ assert(protocol!=IPPROTO_IP || portno<=MAX_IPPROTONUM); + + bool created = false; + current = createPort(portno, protocol, &created); +@@ -566,7 +566,7 @@ Port *PortList::nextPort(const Port *cur, Port *next, + if (cur) { + proto = INPROTO2PORTLISTPROTO(cur->proto); + assert(port_map[proto]!=NULL); // Hmm, it's not possible to handle port that doesn't have anything in map +- assert(cur->proto!=IPPROTO_IP || cur->portno<256); ++ assert(cur->proto!=IPPROTO_IP || cur->portno<=MAX_IPPROTONUM); + mapped_pno = port_map[proto][cur->portno]; + mapped_pno++; // we're interested in next port after current + } else { // running for the first time +@@ -615,7 +615,7 @@ void PortList::mapPort(u16 *portno, u8 *protocol) const { + mapped_protocol = INPROTO2PORTLISTPROTO(*protocol); + + if (*protocol == IPPROTO_IP) +- assert(*portno < 256); ++ assert(*portno <= MAX_IPPROTONUM); + if(port_map[mapped_protocol]==NULL || port_list[mapped_protocol]==NULL) { + fatal("%s(%i,%i): you're trying to access uninitialized protocol", __func__, *portno, *protocol); + } +@@ -713,7 +713,7 @@ int PortList::port_list_count[PORTLIST_PROTO_MAX]; + * should be sorted. */ + void PortList::initializePortMap(int protocol, u16 *ports, int portcount) { + int i; +- int ports_max = (protocol == IPPROTO_IP) ? 256 : 65536; ++ int ports_max = (protocol == IPPROTO_IP) ? MAX_IPPROTONUM + 1 : 65536; + int proto = INPROTO2PORTLISTPROTO(protocol); + + if (port_map[proto] != NULL || port_map_rev[proto] != NULL) +diff --git a/protocols.cc b/protocols.cc +index 76e42c7..85e55e4 100644 +--- a/protocols.cc ++++ b/protocols.cc +@@ -79,7 +79,7 @@ struct strcmp_comparator { + + // IP Protocol number is 8 bits wide + // protocol_table[IPPROTO_TCP] == {"tcp", 6} +-static struct nprotoent *protocol_table[UCHAR_MAX]; ++static struct nprotoent *protocol_table[MAX_IPPROTONUM + 1]; + // proto_map["tcp"] = {"tcp", 6} + typedef std::map<const char *, struct nprotoent, strcmp_comparator> ProtoMap; + static ProtoMap proto_map; +@@ -119,7 +119,7 @@ static int nmap_protocols_init() { + if (*p == '#' || *p == '\0') + continue; + res = sscanf(line, "%127s %hu", protocolname, &protno); +- if (res !=2 || protno > UCHAR_MAX) { ++ if (res !=2 || protno > MAX_IPPROTONUM) { + error("Parse error in protocols file %s line %d", filename, lineno); + continue; + } +@@ -191,7 +191,7 @@ const struct nprotoent *nmap_getprotbynum(int num) { + if (nmap_protocols_init() == -1) + return NULL; + +- assert(num >= 0 && num < UCHAR_MAX); ++ assert(num >= 0 && num <= MAX_IPPROTONUM); + return protocol_table[num]; + } + +diff --git a/protocols.h b/protocols.h +index 8934284..2de0aa4 100644 +--- a/protocols.h ++++ b/protocols.h +@@ -79,6 +79,8 @@ int addprotocolsfromservmask(char *mask, u8 *porttbl); + const struct nprotoent *nmap_getprotbynum(int num); + const struct nprotoent *nmap_getprotbyname(const char *name); + ++#define MAX_IPPROTONUM 255 ++ + #define MAX_IPPROTOSTRLEN 4 + #define IPPROTO2STR(p) \ + ((p)==IPPROTO_TCP ? "tcp" : \ +diff --git a/scan_lists.cc b/scan_lists.cc +index f02e279..ebe1357 100644 +--- a/scan_lists.cc ++++ b/scan_lists.cc +@@ -165,7 +165,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) { + ports->udp_count++; + if (porttbl[i] & SCAN_SCTP_PORT) + ports->sctp_count++; +- if (porttbl[i] & SCAN_PROTOCOLS && i < 256) ++ if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM) + ports->prot_count++; + } + +@@ -192,7 +192,7 @@ void getpts(const char *origexpr, struct scan_lists *ports) { + ports->udp_ports[udpi++] = i; + if (porttbl[i] & SCAN_SCTP_PORT) + ports->sctp_ports[sctpi++] = i; +- if (porttbl[i] & SCAN_PROTOCOLS && i < 256) ++ if (porttbl[i] & SCAN_PROTOCOLS && i <= MAX_IPPROTONUM) + ports->prots[proti++] = i; + } + +@@ -388,7 +388,7 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_ + } else if (isdigit((int) (unsigned char) *current_range)) { + rangestart = strtol(current_range, &endptr, 10); + if (range_type & SCAN_PROTOCOLS) { +- if (rangestart < 0 || rangestart > 255) ++ if (rangestart < 0 || rangestart > MAX_IPPROTONUM) + fatal("Protocols specified must be between 0 and 255 inclusive"); + } else { + if (rangestart < 0 || rangestart > 65535) +@@ -429,13 +429,13 @@ static void getpts_aux(const char *origexpr, int nested, u8 *porttbl, int range_ + if (!*current_range || *current_range == ',' || *current_range == ']') { + /* Ended with a -, meaning up until the last possible port */ + if (range_type & SCAN_PROTOCOLS) +- rangeend = 255; ++ rangeend = MAX_IPPROTONUM; + else + rangeend = 65535; + } else if (isdigit((int) (unsigned char) *current_range)) { + rangeend = strtol(current_range, &endptr, 10); + if (range_type & SCAN_PROTOCOLS) { +- if (rangeend < 0 || rangeend > 255) ++ if (rangeend < 0 || rangeend > MAX_IPPROTONUM) + fatal("Protocols specified must be between 0 and 255 inclusive"); + } else { + if (rangeend < 0 || rangeend > 65535) +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch index 356b5071bf..5669ccdf6a 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-redefine-the-python-library-dir.patch @@ -10,20 +10,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile.in b/Makefile.in -index 1bb062c..cced2fb 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -311,7 +311,7 @@ build-zenmap: $(ZENMAPDIR)/setup.py $(ZENMAPDIR)/zenmapCore/Version.py - - install-zenmap: $(ZENMAPDIR)/setup.py - $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 -- cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --force $(if $(DESTDIR),--root "$(DESTDIR)") -+ cd $(ZENMAPDIR) && $(PYTHON) setup.py --quiet install --prefix "$(prefix)" --install-lib="${PYTHON_SITEPACKAGES_DIR}" --force $(if $(DESTDIR),--root "$(DESTDIR)") - $(INSTALL) -c -m 644 docs/zenmap.1 $(DESTDIR)$(mandir)/man1/ - # Create a symlink from nmapfe to zenmap if nmapfe doesn't exist or is - # already a link. -@@ -328,7 +328,7 @@ build-nping: $(NPINGDIR)/Makefile nbase_build nsock_build netutil_build $(NPINGD +@@ -383,7 +383,7 @@ build-nping: $(NPINGDIR)/Makefile build- @cd $(NPINGDIR) && $(MAKE) install-ndiff: @@ -32,6 +21,3 @@ index 1bb062c..cced2fb 100644 NSE_FILES = scripts/script.db scripts/*.nse NSE_LIB_LUA_FILES = nselib/*.lua nselib/*.luadoc --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch b/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch index cfe043af4b..a07061d4df 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch +++ b/meta-openembedded/meta-oe/recipes-security/nmap/files/nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch @@ -12,11 +12,9 @@ Signed-off-by: Roy Li <rongqing.li@windriver.com> nmap-update/Makefile.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/ncat/Makefile.in b/ncat/Makefile.in -index cfd306d..2166e08 100644 --- a/ncat/Makefile.in +++ b/ncat/Makefile.in -@@ -163,11 +163,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Makefile +@@ -162,11 +162,11 @@ $(NSOCKDIR)/libnsock.a: $(NSOCKDIR)/Make install: $(TARGET) @echo Installing Ncat; @@ -30,19 +28,3 @@ index cfd306d..2166e08 100644 $(INSTALL) -c -m 644 $(DATAFILES) $(DESTDIR)$(pkgdatadir)/; \ fi $(INSTALL) -c -m 644 docs/$(TARGET).1 $(DESTDIR)$(mandir)/man1/$(TARGET).1 -diff --git a/nmap-update/Makefile.in b/nmap-update/Makefile.in -index 89ff928..93f48d8 100644 ---- a/nmap-update/Makefile.in -+++ b/nmap-update/Makefile.in -@@ -37,7 +37,7 @@ $(NBASELIB): - cd $(NBASEDIR) && $(MAKE) - - install: nmap-update -- $(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 -+ mkdir -p -m 755 $(DESTDIR)$(bindir) $(DESTDIR)$(mandir)/man1 - $(INSTALL) -c -m 755 nmap-update $(DESTDIR)$(bindir) - $(STRIP) -x $(DESTDIR)$(bindir)/nmap-update - $(INSTALL) -c -m 644 ../docs/nmap-update.1 $(DESTDIR)$(mandir)/man1/ --- -1.9.1 - diff --git a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.95.bb index f9fe82a91d..a319be4fb0 100644 --- a/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.80.bb +++ b/meta-openembedded/meta-oe/recipes-security/nmap/nmap_7.95.bb @@ -1,28 +1,24 @@ SUMMARY = "network auditing tool" -DESCRIPTION = "Nmap ("Network Mapper") is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" +DESCRIPTION = "Nmap (Network Mapper) is a free and open source (license) utility for network discovery and security auditing.\nGui support via appending to IMAGE_FEATURES x11-base in local.conf" SECTION = "security" LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;beginline=7;endline=12;md5=66938a7e5b4c118eda78271de14874c2" +LIC_FILES_CHKSUM = "file://LICENSE;md5=895af8527fe4bcb72f271fd1841fd2f6" SRC_URI = "http://nmap.org/dist/${BP}.tar.bz2 \ file://nmap-redefine-the-python-library-dir.patch \ file://nmap-replace-shtool-mkdir-with-coreutils-mkdir-command.patch \ file://0001-Include-time.h-header-to-pass-clang-compilation.patch \ file://0002-Fix-building-with-libc.patch \ - file://0001-Make-ndiff-support-python3.patch \ - file://0001-configure.ac-make-ndiff-depend-on-python3.patch \ + file://0003-Fix-off-by-one-overflow-in-the-IP-protocol-table.patch \ " - -SRC_URI[md5sum] = "d37b75b06d1d40f27b76d60db420a1f5" -SRC_URI[sha256sum] = "fcfa5a0e42099e12e4bf7a68ebe6fde05553383a682e816a7ec9256ab4773faa" - +SRC_URI[sha256sum] = "e14ab530e47b5afd88f1c8a2bac7f89cd8fe6b478e22d255c5b9bddb7a1c5778" inherit autotools-brokensep pkgconfig python3native -PACKAGECONFIG ?= "ncat nping pcap" +PACKAGECONFIG ?= "pcre ncat nping pcap" PACKAGECONFIG[pcap] = "--with-pcap=linux, --without-pcap, libpcap, libpcap" -PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre" +PACKAGECONFIG[pcre] = "--with-libpcre=${STAGING_LIBDIR}/.., --with-libpcre=included, libpcre2" PACKAGECONFIG[ssl] = "--with-openssl=${STAGING_LIBDIR}/.., --without-openssl, openssl, openssl" PACKAGECONFIG[ssh2] = "--with-openssh2=${STAGING_LIBDIR}/.., --without-openssh2, libssh2, libssh2" PACKAGECONFIG[libz] = "--with-libz=${STAGING_LIBDIR}/.., --without-libz, zlib, zlib" diff --git a/meta-openembedded/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch b/meta-openembedded/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch new file mode 100644 index 0000000000..6e61aeac3c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-security/softhsm/files/0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch @@ -0,0 +1,672 @@ +From 41968e7b742ad59046523a7eeb63514237fb63af Mon Sep 17 00:00:00 2001 +From: Neil Horman <nhorman@openssl.org> +Date: Fri, 27 Oct 2023 14:57:37 -0400 +Subject: [PATCH] Prevent accessing of global c++ objects once they are deleted + +Fixes (Maybe) #729. +Reset objects_deleted after reset is called. + +Upstream-Status: Submitted [https://github.com/opendnssec/SoftHSMv2/pull/742] +--- + src/lib/SoftHSM.cpp | 5 ++ + src/lib/main.cpp | 138 ++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 143 insertions(+) + +diff --git a/src/lib/SoftHSM.cpp b/src/lib/SoftHSM.cpp +index 02c0f95..95bf208 100644 +--- a/src/lib/SoftHSM.cpp ++++ b/src/lib/SoftHSM.cpp +@@ -89,6 +89,8 @@ + + // Initialise the one-and-only instance + ++int objects_deleted = 0; ++ + #ifdef HAVE_CXX11 + + std::unique_ptr<MutexFactory> MutexFactory::instance(nullptr); +@@ -406,6 +408,8 @@ void SoftHSM::reset() + { + if (instance.get()) + instance.reset(); ++ ++ objects_deleted = 0; + } + + // Constructor +@@ -445,6 +449,7 @@ SoftHSM::~SoftHSM() + + isInitialised = false; + ++ objects_deleted = 1; + resetMutexFactoryCallbacks(); + } + +diff --git a/src/lib/main.cpp b/src/lib/main.cpp +index 2dfd0eb..e89f18c 100644 +--- a/src/lib/main.cpp ++++ b/src/lib/main.cpp +@@ -49,6 +49,8 @@ + #define PKCS_API + #endif + ++extern int objects_deleted; ++ + // PKCS #11 function list + static CK_FUNCTION_LIST functionList = + { +@@ -130,6 +132,8 @@ PKCS_API CK_RV C_Initialize(CK_VOID_PTR pInitArgs) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Initialize(pInitArgs); + } + catch (...) +@@ -145,6 +149,8 @@ PKCS_API CK_RV C_Finalize(CK_VOID_PTR pReserved) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Finalize(pReserved); + } + catch (...) +@@ -160,6 +166,8 @@ PKCS_API CK_RV C_GetInfo(CK_INFO_PTR pInfo) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetInfo(pInfo); + } + catch (...) +@@ -175,6 +183,8 @@ PKCS_API CK_RV C_GetFunctionList(CK_FUNCTION_LIST_PTR_PTR ppFunctionList) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + if (ppFunctionList == NULL_PTR) return CKR_ARGUMENTS_BAD; + + *ppFunctionList = &functionList; +@@ -194,6 +204,8 @@ PKCS_API CK_RV C_GetSlotList(CK_BBOOL tokenPresent, CK_SLOT_ID_PTR pSlotList, CK + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetSlotList(tokenPresent, pSlotList, pulCount); + } + catch (...) +@@ -209,6 +221,8 @@ PKCS_API CK_RV C_GetSlotInfo(CK_SLOT_ID slotID, CK_SLOT_INFO_PTR pInfo) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetSlotInfo(slotID, pInfo); + } + catch (...) +@@ -224,6 +238,8 @@ PKCS_API CK_RV C_GetTokenInfo(CK_SLOT_ID slotID, CK_TOKEN_INFO_PTR pInfo) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetTokenInfo(slotID, pInfo); + } + catch (...) +@@ -239,6 +255,8 @@ PKCS_API CK_RV C_GetMechanismList(CK_SLOT_ID slotID, CK_MECHANISM_TYPE_PTR pMech + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetMechanismList(slotID, pMechanismList, pulCount); + } + catch (...) +@@ -254,6 +272,8 @@ PKCS_API CK_RV C_GetMechanismInfo(CK_SLOT_ID slotID, CK_MECHANISM_TYPE type, CK_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetMechanismInfo(slotID, type, pInfo); + } + catch (...) +@@ -269,6 +289,8 @@ PKCS_API CK_RV C_InitToken(CK_SLOT_ID slotID, CK_UTF8CHAR_PTR pPin, CK_ULONG ulP + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_InitToken(slotID, pPin, ulPinLen, pLabel); + } + catch (...) +@@ -284,6 +306,8 @@ PKCS_API CK_RV C_InitPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pPin, CK_UL + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_InitPIN(hSession, pPin, ulPinLen); + } + catch (...) +@@ -299,6 +323,8 @@ PKCS_API CK_RV C_SetPIN(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pOldPin, CK_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SetPIN(hSession, pOldPin, ulOldLen, pNewPin, ulNewLen); + } + catch (...) +@@ -314,6 +340,8 @@ PKCS_API CK_RV C_OpenSession(CK_SLOT_ID slotID, CK_FLAGS flags, CK_VOID_PTR pApp + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_OpenSession(slotID, flags, pApplication, notify, phSession); + } + catch (...) +@@ -329,6 +357,8 @@ PKCS_API CK_RV C_CloseSession(CK_SESSION_HANDLE hSession) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_CloseSession(hSession); + } + catch (...) +@@ -344,6 +374,8 @@ PKCS_API CK_RV C_CloseAllSessions(CK_SLOT_ID slotID) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_CloseAllSessions(slotID); + } + catch (...) +@@ -359,6 +391,8 @@ PKCS_API CK_RV C_GetSessionInfo(CK_SESSION_HANDLE hSession, CK_SESSION_INFO_PTR + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetSessionInfo(hSession, pInfo); + } + catch (...) +@@ -374,6 +408,8 @@ PKCS_API CK_RV C_GetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetOperationState(hSession, pOperationState, pulOperationStateLen); + } + catch (...) +@@ -389,6 +425,8 @@ PKCS_API CK_RV C_SetOperationState(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pOper + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SetOperationState(hSession, pOperationState, ulOperationStateLen, hEncryptionKey, hAuthenticationKey); + } + catch (...) +@@ -404,6 +442,8 @@ PKCS_API CK_RV C_Login(CK_SESSION_HANDLE hSession, CK_USER_TYPE userType, CK_UTF + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Login(hSession, userType, pPin, ulPinLen); + } + catch (...) +@@ -419,6 +459,8 @@ PKCS_API CK_RV C_Logout(CK_SESSION_HANDLE hSession) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Logout(hSession); + } + catch (...) +@@ -434,6 +476,8 @@ PKCS_API CK_RV C_CreateObject(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pTemp + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_CreateObject(hSession, pTemplate, ulCount, phObject); + } + catch (...) +@@ -449,6 +493,8 @@ PKCS_API CK_RV C_CopyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_CopyObject(hSession, hObject, pTemplate, ulCount, phNewObject); + } + catch (...) +@@ -464,6 +510,8 @@ PKCS_API CK_RV C_DestroyObject(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DestroyObject(hSession, hObject); + } + catch (...) +@@ -479,6 +527,8 @@ PKCS_API CK_RV C_GetObjectSize(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObj + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetObjectSize(hSession, hObject, pulSize); + } + catch (...) +@@ -494,6 +544,8 @@ PKCS_API CK_RV C_GetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetAttributeValue(hSession, hObject, pTemplate, ulCount); + } + catch (...) +@@ -509,6 +561,8 @@ PKCS_API CK_RV C_SetAttributeValue(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SetAttributeValue(hSession, hObject, pTemplate, ulCount); + } + catch (...) +@@ -524,6 +578,8 @@ PKCS_API CK_RV C_FindObjectsInit(CK_SESSION_HANDLE hSession, CK_ATTRIBUTE_PTR pT + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_FindObjectsInit(hSession, pTemplate, ulCount); + } + catch (...) +@@ -539,6 +595,8 @@ PKCS_API CK_RV C_FindObjects(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE_PTR ph + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_FindObjects(hSession, phObject, ulMaxObjectCount, pulObjectCount); + } + catch (...) +@@ -554,6 +612,8 @@ PKCS_API CK_RV C_FindObjectsFinal(CK_SESSION_HANDLE hSession) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_FindObjectsFinal(hSession); + } + catch (...) +@@ -569,6 +629,8 @@ PKCS_API CK_RV C_EncryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_EncryptInit(hSession, pMechanism, hObject); + } + catch (...) +@@ -584,6 +646,8 @@ PKCS_API CK_RV C_Encrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Encrypt(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); + } + catch (...) +@@ -599,6 +663,8 @@ PKCS_API CK_RV C_EncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_EncryptUpdate(hSession, pData, ulDataLen, pEncryptedData, pulEncryptedDataLen); + } + catch (...) +@@ -614,6 +680,8 @@ PKCS_API CK_RV C_EncryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypted + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_EncryptFinal(hSession, pEncryptedData, pulEncryptedDataLen); + } + catch (...) +@@ -629,6 +697,8 @@ PKCS_API CK_RV C_DecryptInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DecryptInit(hSession, pMechanism, hObject); + } + catch (...) +@@ -644,6 +714,8 @@ PKCS_API CK_RV C_Decrypt(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncryptedData, + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Decrypt(hSession, pEncryptedData, ulEncryptedDataLen, pData, pulDataLen); + } + catch (...) +@@ -659,6 +731,8 @@ PKCS_API CK_RV C_DecryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEncrypte + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DecryptUpdate(hSession, pEncryptedData, ulEncryptedDataLen, pData, pDataLen); + } + catch (...) +@@ -674,6 +748,8 @@ PKCS_API CK_RV C_DecryptFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DecryptFinal(hSession, pData, pDataLen); + } + catch (...) +@@ -689,6 +765,8 @@ PKCS_API CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DigestInit(hSession, pMechanism); + } + catch (...) +@@ -704,6 +782,8 @@ PKCS_API CK_RV C_Digest(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Digest(hSession, pData, ulDataLen, pDigest, pulDigestLen); + } + catch (...) +@@ -719,6 +799,8 @@ PKCS_API CK_RV C_DigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DigestUpdate(hSession, pPart, ulPartLen); + } + catch (...) +@@ -734,6 +816,8 @@ PKCS_API CK_RV C_DigestKey(CK_SESSION_HANDLE hSession, CK_OBJECT_HANDLE hObject) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DigestKey(hSession, hObject); + } + catch (...) +@@ -749,6 +833,8 @@ PKCS_API CK_RV C_DigestFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pDigest, CK + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DigestFinal(hSession, pDigest, pulDigestLen); + } + catch (...) +@@ -764,6 +850,8 @@ PKCS_API CK_RV C_SignInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanis + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignInit(hSession, pMechanism, hKey); + } + catch (...) +@@ -779,6 +867,8 @@ PKCS_API CK_RV C_Sign(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG ul + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Sign(hSession, pData, ulDataLen, pSignature, pulSignatureLen); + } + catch (...) +@@ -794,6 +884,8 @@ PKCS_API CK_RV C_SignUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_UL + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignUpdate(hSession, pPart, ulPartLen); + } + catch (...) +@@ -809,6 +901,8 @@ PKCS_API CK_RV C_SignFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, C + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignFinal(hSession, pSignature, pulSignatureLen); + } + catch (...) +@@ -824,6 +918,8 @@ PKCS_API CK_RV C_SignRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pM + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignRecoverInit(hSession, pMechanism, hKey); + } + catch (...) +@@ -839,6 +935,8 @@ PKCS_API CK_RV C_SignRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_U + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignRecover(hSession, pData, ulDataLen, pSignature, pulSignatureLen); + } + catch (...) +@@ -854,6 +952,8 @@ PKCS_API CK_RV C_VerifyInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechan + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_VerifyInit(hSession, pMechanism, hKey); + } + catch (...) +@@ -869,6 +969,8 @@ PKCS_API CK_RV C_Verify(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData, CK_ULONG + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_Verify(hSession, pData, ulDataLen, pSignature, ulSignatureLen); + } + catch (...) +@@ -884,6 +986,8 @@ PKCS_API CK_RV C_VerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart, CK_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_VerifyUpdate(hSession, pPart, ulPartLen); + } + catch (...) +@@ -899,6 +1003,8 @@ PKCS_API CK_RV C_VerifyFinal(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignature, + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_VerifyFinal(hSession, pSignature, ulSignatureLen); + } + catch (...) +@@ -914,6 +1020,8 @@ PKCS_API CK_RV C_VerifyRecoverInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_VerifyRecoverInit(hSession, pMechanism, hKey); + } + catch (...) +@@ -929,6 +1037,8 @@ PKCS_API CK_RV C_VerifyRecover(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSignatur + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_VerifyRecover(hSession, pSignature, ulSignatureLen, pData, pulDataLen); + } + catch (...) +@@ -944,6 +1054,8 @@ PKCS_API CK_RV C_DigestEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DigestEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); + } + catch (...) +@@ -959,6 +1071,8 @@ PKCS_API CK_RV C_DecryptDigestUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPa + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DecryptDigestUpdate(hSession, pPart, ulPartLen, pDecryptedPart, pulDecryptedPartLen); + } + catch (...) +@@ -974,6 +1088,8 @@ PKCS_API CK_RV C_SignEncryptUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SignEncryptUpdate(hSession, pPart, ulPartLen, pEncryptedPart, pulEncryptedPartLen); + } + catch (...) +@@ -989,6 +1105,8 @@ PKCS_API CK_RV C_DecryptVerifyUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pEn + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DecryptVerifyUpdate(hSession, pEncryptedPart, ulEncryptedPartLen, pPart, pulPartLen); + } + catch (...) +@@ -1004,6 +1122,8 @@ PKCS_API CK_RV C_GenerateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMecha + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GenerateKey(hSession, pMechanism, pTemplate, ulCount, phKey); + } + catch (...) +@@ -1029,6 +1149,8 @@ PKCS_API CK_RV C_GenerateKeyPair + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GenerateKeyPair(hSession, pMechanism, pPublicKeyTemplate, ulPublicKeyAttributeCount, pPrivateKeyTemplate, ulPrivateKeyAttributeCount, phPublicKey, phPrivateKey); + } + catch (...) +@@ -1052,6 +1174,8 @@ PKCS_API CK_RV C_WrapKey + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_WrapKey(hSession, pMechanism, hWrappingKey, hKey, pWrappedKey, pulWrappedKeyLen); + } + catch (...) +@@ -1077,6 +1201,8 @@ PKCS_API CK_RV C_UnwrapKey + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_UnwrapKey(hSession, pMechanism, hUnwrappingKey, pWrappedKey, ulWrappedKeyLen, pTemplate, ulCount, phKey); + } + catch (...) +@@ -1100,6 +1226,8 @@ PKCS_API CK_RV C_DeriveKey + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_DeriveKey(hSession, pMechanism, hBaseKey, pTemplate, ulCount, phKey); + } + catch (...) +@@ -1115,6 +1243,8 @@ PKCS_API CK_RV C_SeedRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pSeed, CK_UL + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_SeedRandom(hSession, pSeed, ulSeedLen); + } + catch (...) +@@ -1130,6 +1260,8 @@ PKCS_API CK_RV C_GenerateRandom(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pRandomD + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GenerateRandom(hSession, pRandomData, ulRandomLen); + } + catch (...) +@@ -1145,6 +1277,8 @@ PKCS_API CK_RV C_GetFunctionStatus(CK_SESSION_HANDLE hSession) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_GetFunctionStatus(hSession); + } + catch (...) +@@ -1160,6 +1294,8 @@ PKCS_API CK_RV C_CancelFunction(CK_SESSION_HANDLE hSession) + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_CancelFunction(hSession); + } + catch (...) +@@ -1175,6 +1311,8 @@ PKCS_API CK_RV C_WaitForSlotEvent(CK_FLAGS flags, CK_SLOT_ID_PTR pSlot, CK_VOID_ + { + try + { ++ if (objects_deleted == 1) ++ return CKR_FUNCTION_FAILED; + return SoftHSM::i()->C_WaitForSlotEvent(flags, pSlot, pReserved); + } + catch (...) +-- +2.42.0 + diff --git a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb index 930bca96ff..66f0488792 100644 --- a/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb +++ b/meta-openembedded/meta-oe/recipes-security/softhsm/softhsm_2.6.1.bb @@ -7,6 +7,7 @@ DEPENDS = "sqlite3" SRC_URI = "https://dist.opendnssec.org/source/softhsm-2.6.1.tar.gz \ file://0001-avoid-unnecessary-check-for-sqlite3-binary.patch \ + file://0002-Prevent-accessing-of-global-c-objects-once-they-are-.patch \ " SRC_URI[sha256sum] = "61249473054bcd1811519ef9a989a880a7bdcc36d317c9c25457fc614df475f2" diff --git a/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb index 752938057a..ede9a5f058 100644 --- a/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb +++ b/meta-openembedded/meta-oe/recipes-security/usbguard/usbguard_1.1.3.bb @@ -27,6 +27,8 @@ EXTRA_OECONF += "\ --with-bundled-pegtl \ " +LDFLAGS:append:riscv32 = " -latomic" + PACKAGECONFIG ?= "\ openssl \ ${@bb.utils.filter('DISTRO_FEATURES', 'polkit', d)} \ diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch deleted file mode 100644 index fb8fa3427f..0000000000 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_1.patch +++ /dev/null @@ -1,60 +0,0 @@ -Origin: commit c187154f47697cdbf822c2f9d714d570ed4a0fd1 -From: Oliver Kiddle <opk@zsh.org> -Date: Wed, 15 Dec 2021 01:56:40 +0100 -Subject: [PATCH 1/9] security/41: Don't perform PROMPT_SUBST evaluation on - %F/%K arguments - -Mitigates CVE-2021-45444 - -https://salsa.debian.org/debian/zsh/-/raw/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_1.patch?inline=false -Upstream-Status: Backport -CVE: CVE-2021-45444 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> ---- - ChangeLog | 5 +++++ - Src/prompt.c | 10 ++++++++++ - 2 files changed, 15 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 8d7dfc169..eb248ec06 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,3 +1,8 @@ -+2022-01-27 dana <dana@dana.is> -+ -+ * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive -+ PROMPT_SUBST -+ - 2020-02-14 dana <dana@dana.is> - - * unposted: Config/version.mk: Update for 5.8 -diff --git a/Src/prompt.c b/Src/prompt.c -index b65bfb86b..91e21c8e9 100644 ---- a/Src/prompt.c -+++ b/Src/prompt.c -@@ -244,6 +244,12 @@ parsecolorchar(zattr arg, int is_fg) - bv->fm += 2; /* skip over F{ */ - if ((ep = strchr(bv->fm, '}'))) { - char oc = *ep, *col, *coll; -+ int ops = opts[PROMPTSUBST], opb = opts[PROMPTBANG]; -+ int opp = opts[PROMPTPERCENT]; -+ -+ opts[PROMPTPERCENT] = 1; -+ opts[PROMPTSUBST] = opts[PROMPTBANG] = 0; -+ - *ep = '\0'; - /* expand the contents of the argument so you can use - * %v for example */ -@@ -252,6 +258,10 @@ parsecolorchar(zattr arg, int is_fg) - arg = match_colour((const char **)&coll, is_fg, 0); - free(col); - bv->fm = ep; -+ -+ opts[PROMPTSUBST] = ops; -+ opts[PROMPTBANG] = opb; -+ opts[PROMPTPERCENT] = opp; - } else { - arg = match_colour((const char **)&bv->fm, is_fg, 0); - if (*bv->fm != '}') --- -2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch deleted file mode 100644 index e5b6d7cdc9..0000000000 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_2.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 8a4d65ef6d0023ab9b238529410afb433553d2fa Mon Sep 17 00:00:00 2001 -From: Marc Cornellà <hello@mcornella.com> -Date: Mon, 24 Jan 2022 09:43:28 +0100 -Subject: [PATCH 2/9] security/89: Add patch which can optionally be used to - work around CVE-2021-45444 in VCS_Info -Comment: Updated to use the same file name without blanks as actually - used in the final 5.8.1 release. - - -https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_2.patch -Upstream-Status: Backport -CVE: CVE-2021-45444 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> ---- - ChangeLog | 5 + - Etc/CVE-2021-45444-VCS_Info-workaround.patch | 98 ++++++++++++++++++++ - 2 files changed, 103 insertions(+) - create mode 100644 Etc/CVE-2021-45444-VCS_Info-workaround.patch - -diff --git a/ChangeLog b/ChangeLog -index eb248ec06..9a05a09e1 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,10 @@ - 2022-01-27 dana <dana@dana.is> - -+ * Marc Cornellà: security/89: -+ Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which -+ can optionally be used to work around recursive PROMPT_SUBST -+ issue in VCS_Info -+ - * Oliver Kiddle: security/41: Src/prompt.c: Prevent recursive - PROMPT_SUBST - -diff --git a/Etc/CVE-2021-45444-VCS_Info-workaround.patch b/Etc/CVE-2021-45444-VCS_Info-workaround.patch -new file mode 100644 -index 000000000..13e54be77 ---- /dev/null -+++ b/Etc/CVE-2021-45444-VCS_Info-workaround.patch -@@ -0,0 +1,98 @@ -+From 972887bbe5eb6a00e5f0e73781d6d73bfdcafb93 Mon Sep 17 00:00:00 2001 -+From: =?UTF-8?q?Marc=20Cornell=C3=A0?= <hello@mcornella.com> -+Date: Mon, 24 Jan 2022 09:43:28 +0100 -+Subject: [PATCH] security/89: Partially work around CVE-2021-45444 in VCS_Info -+MIME-Version: 1.0 -+Content-Type: text/plain; charset=UTF-8 -+Content-Transfer-Encoding: 8bit -+ -+This patch is a partial, VCS_Info-specific work-around for CVE-2021-45444, -+which is mitigated in the shell itself in 5.8.1 and later versions. It is -+offered for users who are concerned about an exploit but are unable to update -+their binaries to receive the complete fix. -+ -+The patch works around the vulnerability by pre-escaping values substituted -+into format strings in VCS_Info. Please note that this may break some user -+configurations that rely on those values being un-escaped (which is why it was -+not included directly in 5.8.1). It may be possible to limit this breakage by -+adjusting exactly which ones are pre-escaped, but of course this may leave -+them vulnerable again. -+ -+If applying the patch to the file system is inconvenient or not possible, the -+following script can be used to idempotently patch the relevant function -+running in memory (and thus must be re-run when the shell is restarted): -+ -+ -+# Impacted versions go from v5.0.3 to v5.8 (v5.8.1 is the first patched version) -+autoload -Uz is-at-least -+if is-at-least 5.8.1 || ! is-at-least 5.0.3; then -+ return -+fi -+ -+# Quote necessary $hook_com[<field>] items just before they are used -+# in the line "VCS_INFO_hook 'post-backend'" of the VCS_INFO_formats -+# function, where <field> is: -+# -+# base: the full path of the repository's root directory. -+# base-name: the name of the repository's root directory. -+# branch: the name of the currently checked out branch. -+# revision: an identifier of the currently checked out revision. -+# subdir: the path of the current directory relative to the -+# repository's root directory. -+# misc: a string that may contain anything the vcs_info backend wants. -+# -+# This patch %-quotes these fields previous to their use in vcs_info hooks and -+# the zformat call and, eventually, when they get expanded in the prompt. -+# It's important to quote these here, and not later after hooks have modified the -+# fields, because then we could be quoting % characters from valid prompt sequences, -+# like %F{color}, %B, etc. -+# -+# 32 │ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" -+# 33 │ hook_com[subdir_orig]="${hook_com[subdir]}" -+# 34 │ -+# 35 + │ for tmp in base base-name branch misc revision subdir; do -+# 36 + │ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" -+# 37 + │ done -+# 38 + │ -+# 39 │ VCS_INFO_hook 'post-backend' -+# -+# This is especially important so that no command substitution is performed -+# due to malicious input as a consequence of CVE-2021-45444, which affects -+# zsh versions from 5.0.3 to 5.8. -+# -+autoload -Uz +X regexp-replace VCS_INFO_formats -+ -+# We use $tmp here because it's already a local variable in VCS_INFO_formats -+typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"' -+# Unique string to avoid reapplying the patch if this code gets called twice -+typeset PATCH_ID=vcs_info-patch-9b9840f2-91e5-4471-af84-9e9a0dc68c1b -+# Only patch the VCS_INFO_formats function if not already patched -+if [[ "$functions[VCS_INFO_formats]" != *$PATCH_ID* ]]; then -+ regexp-replace 'functions[VCS_INFO_formats]' \ -+ "VCS_INFO_hook 'post-backend'" \ -+ ': ${PATCH_ID}; ${PATCH}; ${MATCH}' -+fi -+unset PATCH PATCH_ID -+ -+ -+--- -+ Functions/VCS_Info/VCS_INFO_formats | 4 ++++ -+ 1 file changed, 4 insertions(+) -+ -+diff --git a/Functions/VCS_Info/VCS_INFO_formats b/Functions/VCS_Info/VCS_INFO_formats -+index e0e1dc738..4d88e28b6 100644 -+--- a/Functions/VCS_Info/VCS_INFO_formats -++++ b/Functions/VCS_Info/VCS_INFO_formats -+@@ -32,6 +32,10 @@ hook_com[base-name_orig]="${hook_com[base_name]}" -+ hook_com[subdir]="$(VCS_INFO_reposub ${hook_com[base]})" -+ hook_com[subdir_orig]="${hook_com[subdir]}" -+ -++for tmp in base base-name branch misc revision subdir; do -++ hook_com[$tmp]="${hook_com[$tmp]//\%/%%}" -++done -++ -+ VCS_INFO_hook 'post-backend' -+ -+ ## description (for backend authors): -+-- -+2.34.1 --- -2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch deleted file mode 100644 index adfc00ae57..0000000000 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh/CVE-2021-45444_3.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 4abf2fc193fc2f3e680deecbf81289a7b02e245b Mon Sep 17 00:00:00 2001 -From: dana <dana@dana.is> -Date: Tue, 21 Dec 2021 13:13:33 -0600 -Subject: [PATCH 3/9] CVE-2021-45444: Update NEWS/README - -https://salsa.debian.org/debian/zsh/-/blob/debian/5.8-6+deb11u1/debian/patches/cherry-pick-CVE-2021-45444_3.patch -Upstream-Status: Backport -CVE: CVE-2021-45444 -Signed-off-by: Chee Yang Lee <chee.yang.lee@intel.com> ---- - ChangeLog | 2 ++ - NEWS | 20 ++++++++++++++++++++ - README | 6 ++++++ - 3 files changed, 28 insertions(+) - -diff --git a/ChangeLog b/ChangeLog -index 9a05a09e1..93b0bc337 100644 ---- a/ChangeLog -+++ b/ChangeLog -@@ -1,5 +1,7 @@ - 2022-01-27 dana <dana@dana.is> - -+ * CVE-2021-45444: NEWS, README: Document preceding two changes -+ - * Marc Cornellà: security/89: - Etc/CVE-2021-45444-VCS_Info-workaround.patch: Add patch which - can optionally be used to work around recursive PROMPT_SUBST -diff --git a/NEWS b/NEWS -index 964e1633f..d34b3f79e 100644 ---- a/NEWS -+++ b/NEWS -@@ -4,6 +4,26 @@ CHANGES FROM PREVIOUS VERSIONS OF ZSH - - Note also the list of incompatibilities in the README file. - -+Changes since 5.8 -+----------------- -+ -+CVE-2021-45444: Some prompt expansion sequences, such as %F, support -+'arguments' which are themselves expanded in case they contain colour -+values, etc. This additional expansion would trigger PROMPT_SUBST -+evaluation, if enabled. This could be abused to execute code the user -+didn't expect. e.g., given a certain prompt configuration, an attacker -+could trick a user into executing arbitrary code by having them check -+out a Git branch with a specially crafted name. -+ -+This is fixed in the shell itself by no longer performing PROMPT_SUBST -+evaluation on these prompt-expansion arguments. -+ -+Users who are concerned about an exploit but unable to update their -+binaries may apply the partial work-around described in the file -+'Etc/CVE-2021-45444 VCS_Info workaround.patch' included with the shell -+source. [ Reported by RyotaK <security@ryotak.me>. Additional thanks to -+Marc Cornellà <hello@mcornella.com>. ] -+ - Changes since 5.7.1-test-3 - -------------------------- - -diff --git a/README b/README -index 7f1dd5f92..c9e994ab3 100644 ---- a/README -+++ b/README -@@ -31,6 +31,12 @@ Zsh is a shell with lots of features. For a list of some of these, see the - file FEATURES, and for the latest changes see NEWS. For more - details, see the documentation. - -+Incompatibilities since 5.8 -+--------------------------- -+ -+PROMPT_SUBST expansion is no longer performed on arguments to prompt- -+expansion sequences such as %F. -+ - Incompatibilities since 5.7.1 - ----------------------------- - --- -2.34.1 diff --git a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.9.bb index 7602ff9f64..7940970e45 100644 --- a/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.8.bb +++ b/meta-openembedded/meta-oe/recipes-shells/zsh/zsh_5.9.bb @@ -10,12 +10,8 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=1a4c4cda3e8096d2fd483ff2f4514fec" DEPENDS = "ncurses bison-native libcap libpcre gdbm groff-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/5.8/${BP}.tar.xz \ - file://CVE-2021-45444_1.patch \ - file://CVE-2021-45444_2.patch \ - file://CVE-2021-45444_3.patch \ - " -SRC_URI[sha256sum] = "dcc4b54cc5565670a65581760261c163d720991f0d06486da61f8d839b52de27" +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "9b8d1ecedd5b5e81fbf1918e876752a7dd948e05c1a0dba10ab863842d45acd5" inherit autotools-brokensep gettext update-alternatives manpages @@ -50,13 +46,17 @@ do_configure () { oe_runconf } +do_install:append() { + sed -i -e '1!b; s:^#!.*[ /]zsh:#!${bindir}/zsh:; s#/usr/local/bin#${bindir}#;' \ + `find ${D}/usr/share/zsh/${PV}/functions -type f` +} + pkg_postinst:${PN} () { touch $D${sysconfdir}/shells - grep -q "bin/zsh" $D${sysconfdir}/shells || echo /bin/zsh >> $D${sysconfdir}/shells - grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells + for i in zsh sh + do + grep -q "bin/$i" $D${sysconfdir}/shells || \ + printf >> $D${sysconfdir}/shells \ + "${bindir}/$i\n${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/$i\n', '', d)}" + done } - -# work around QA failures with usrmerge installing zsh in /usr/bin/zsh instead of /bin/zsh -# ERROR: QA Issue: /usr/share/zsh/5.8/functions/zed contained in package zsh requires /bin/zsh, but no providers found in RDEPENDS:zsh? [file-rdeps] -# like bash does since https://git.openembedded.org/openembedded-core/commit/?id=4759408677a4e60c5fa7131afcb5bc184cf2f90a -RPROVIDES:${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'usrmerge', '/bin/zsh', '', d)}" diff --git a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb index f2bf52cdbc..ed87b3de43 100644 --- a/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb +++ b/meta-openembedded/meta-oe/recipes-support/anthy/anthy_9100h.bb @@ -17,6 +17,9 @@ SRC_URI:append:class-native = " file://native-helpers.patch" SRC_URI[md5sum] = "1f558ff7ed296787b55bb1c6cf131108" SRC_URI[sha256sum] = "d256f075f018b4a3cb0d165ed6151fda4ba7db1621727e0eb54569b6e2275547" +UPSTREAM_CHECK_URI = "https://osdn.net/projects/anthy/releases/" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>(\d+)+(\w*))" + DEPENDS:class-target = "anthy-native" RDEPENDS:${PN}:class-target = "libanthy0" diff --git a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb index 4b0e74227b..df45eede23 100644 --- a/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/atop/atop_2.4.0.bb @@ -24,6 +24,9 @@ SRC_URI = "http://www.atoptool.nl/download/${BP}.tar.gz \ SRC_URI[md5sum] = "1077da884ed94f2bc3c81ac3ab970436" SRC_URI[sha256sum] = "be1c010a77086b7d98376fce96514afcd73c3f20a8d1fe01520899ff69a73d69" +UPSTREAM_CHECK_URI = "https://atoptool.nl/downloadatop.php" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+).tar" + CVE_STATUS[CVE-2011-3618] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb index 6ec25bdd2b..0ac1decccf 100644 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c++_1.11.3.bb @@ -20,3 +20,8 @@ S = "${WORKDIR}/git/lang/c++" inherit cmake pkgconfig BBCLASSEXTEND = "native nativesdk" + +# http://errors.yoctoproject.org/Errors/Details/766913/ +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:304:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +# avro-c++/1.11.3/git/lang/c++/impl/Compiler.cc:370:18: error: possibly dangling reference to a temporary [-Werror=dangling-reference] +CXXFLAGS += "-Wno-error=dangling-reference" diff --git a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.3.bb b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.3.bb index bb7f53e459..bf84242e29 100644 --- a/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/avro/avro-c_1.11.3.bb @@ -15,3 +15,9 @@ SRC_URI = "git://github.com/apache/avro;branch=${BRANCH};protocol=https \ S = "${WORKDIR}/git/lang/c" inherit cmake pkgconfig + +# http://errors.yoctoproject.org/Errors/Details/766902/ +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:123:61: error: passing argument 3 of 'first_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:127:60: error: passing argument 3 of 'last_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +# avro-c/1.11.3/git/lang/c/examples/quickstop.c:131:61: error: passing argument 3 of 'phone_value.iface->get_string' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb index a5a7a63657..fe51c1029d 100644 --- a/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/bdwgc/bdwgc_8.2.8.bb @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://README.QUICK;md5=dd27361ad00943bb27bc3e0589037075" DEPENDS = "libatomic-ops" -SRCREV = "e340b2e869e02718de9c9d7fa440ef4b35785388" +SRCREV = "ee59af3722e56de8404de6cd0c21c2493cc4d855" SRC_URI = "git://github.com/ivmai/bdwgc.git;branch=release-8_2;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb b/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb index 72a2e16e45..e32aba93ce 100644 --- a/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb +++ b/meta-openembedded/meta-oe/recipes-support/ckermit/ckermit_302.bb @@ -14,6 +14,8 @@ SRC_URI = "http://www.kermitproject.org/ftp/kermit/archives/cku${PV}.tar.gz;subd SRC_URI[md5sum] = "eac4dbf18b45775e4cdee5a7c74762b0" SRC_URI[sha256sum] = "0d5f2cd12bdab9401b4c836854ebbf241675051875557783c332a6a40dac0711" +UPSTREAM_CHECK_URI = "https://www.kermitproject.org/ck90.html" +UPSTREAM_CHECK_REGEX = "cku(?P<pver>\d+)\.tar" export CC2 = "${CC}" export BINDIR = "${bindir}" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.0.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.1.bb index ce8b4cd493..1edb95e455 100644 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.31.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-2-Clause & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" SRC_URI = "git://github.com/commonmark/cmark.git;branch=master;protocol=https" -SRCREV = "8fbf029685482827828b5858444157052f1b0a5f" +SRCREV = "bb3678d7a73cb02d35c8876ecd097072636200a8" S = "${WORKDIR}/git" inherit cmake lib_package diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb index e300222518..6eb9db8dab 100644 --- a/meta-openembedded/meta-oe/recipes-support/colord/colord.bb +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord.bb @@ -1,28 +1,33 @@ require ${BPN}.inc -inherit meson gobject-introspection gsettings gettext bash-completion systemd features_check useradd pkgconfig +inherit meson gobject-introspection gsettings gtk-doc gettext bash-completion systemd features_check useradd pkgconfig # polkit and gobject-introspection are mandatory and cannot be configured REQUIRED_DISTRO_FEATURES = "polkit gobject-introspection-data" GIR_MESON_OPTION = "" DEPENDS += " \ - ${BPN}-native \ - glib-2.0 \ - lcms \ - sqlite3 \ - libgusb \ - libgudev \ - polkit \ + ${BPN}-native \ + dbus \ + glib-2.0 \ + lcms \ + libgudev \ + libgusb \ + polkit \ + sqlite3 \ " +RDEPENDS:${PN} += "hwdata" + SRC_URI += " \ - file://0001-Run-native-cd_idt8-cd_create_profile.patch \ + file://0001-Run-native-cd_idt8-cd_create_profile.patch \ + file://08a32b2379fb5582f4312e59bf51a2823df56276.patch \ " -EXTRA_OEMESON = " \ - -Dman=false \ - -Ddocs=false \ +EXTRA_OEMESON += " \ + -Dman=false \ + -Ddaemon_user=colord \ + -Dpnp_ids=${datadir}/hwdata/pnp.ids \ " PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" @@ -42,4 +47,5 @@ FILES:${PN} += " \ " USERADD_PACKAGES = "${PN}" -USERADD_PARAM:${PN} = "--system --user-group -d /var/lib/colord -s /bin/false colord" +USERADD_PARAM:${PN} = "--system --user-group -s /bin/false colord" + diff --git a/meta-openembedded/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch b/meta-openembedded/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch new file mode 100644 index 0000000000..860e6ab4af --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/colord/colord/08a32b2379fb5582f4312e59bf51a2823df56276.patch @@ -0,0 +1,28 @@ +From 08a32b2379fb5582f4312e59bf51a2823df56276 Mon Sep 17 00:00:00 2001 +From: Richard Hughes <richard@hughsie.com> +Date: Mon, 29 Jan 2024 10:37:11 +0000 +Subject: [PATCH] Fix writing to the database with ProtectSystem=strict + +Fixes https://github.com/hughsie/colord/issues/166 + +Upstream-Status: Backport [https://github.com/hughsie/colord/commit/08a32b2379fb5582f4312e59bf51a2823df56276] +Signed-off-by: Markus Volk <f_l_k@t-online.de> +--- + data/colord.service.in | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/data/colord.service.in b/data/colord.service.in +index 6825d944..c358dc4b 100644 +--- a/data/colord.service.in ++++ b/data/colord.service.in +@@ -17,6 +17,10 @@ ProtectControlGroups=true + RestrictRealtime=true + RestrictAddressFamilies=AF_UNIX + ++ConfigurationDirectory=colord ++StateDirectory=colord ++CacheDirectory=colord ++ + # drop all capabilities + 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 + diff --git a/meta-openembedded/meta-oe/recipes-support/composefs/composefs_1.0.4.bb b/meta-openembedded/meta-oe/recipes-support/composefs/composefs_1.0.5.bb index aaf33b40ec..14133fdcb6 100644 --- a/meta-openembedded/meta-oe/recipes-support/composefs/composefs_1.0.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/composefs/composefs_1.0.5.bb @@ -13,21 +13,18 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.Apache-2.0;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -PV .= "+git${SRCPV}" -SRCREV = "7623e4dc89f62ada5724d4e41d0a16d2671312f5" +SRCREV = "098d985a1b9a15ac828d7b2382297a6955e31e40" SRC_URI = "git://github.com/containers/composefs.git;protocol=https;branch=main" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson DEPENDS = "openssl" -EXTRA_OECONF += " \ - --disable-man \ - --without-fuse \ +EXTRA_OEMESON += " \ + -Dman=disabled \ + -Dfuse=disabled \ " -LDFLAGS:append:class-native = " -pthread" - BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb index 90db08544d..ece30a598b 100644 --- a/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb +++ b/meta-openembedded/meta-oe/recipes-support/ctapi-common/ctapi-common_1.1-14.bb @@ -8,6 +8,9 @@ SRC_URI = "https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/ https://archives.fedoraproject.org/pub/archive/fedora/linux/releases/23/Everything/source/SRPMS/c/${BPN}-${PV}.fc23.src.rpm;extract=ctapi-common.README" SRC_URI[sha256sum] = "87a74eb0a66055c34ba2c5c919e74f3211c5950ae1c2cbab967fdf4137f5de91" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_compile() { install -pm 644 ${UNPACKDIR}/ctapi-common.LICENSE LICENSE install -pm 644 ${UNPACKDIR}/ctapi-common.README README diff --git a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb index a35b54e3bc..6561a4ae02 100644 --- a/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb +++ b/meta-openembedded/meta-oe/recipes-support/daemontools/daemontools_0.76.bb @@ -29,6 +29,8 @@ SRC_URI = "http://cr.yp.to/daemontools/${BPN}-${PV}.tar.gz \ SRC_URI[md5sum] = "1871af2453d6e464034968a0fbcb2bfc" SRC_URI[sha256sum] = "a55535012b2be7a52dcd9eccabb9a198b13be50d0384143bd3b32b8710df4c1f" +UPSTREAM_CHECK_URI = "http://cr.yp.to/daemontools/install.html" + S = "${WORKDIR}/admin/${BP}" do_compile() { @@ -46,3 +48,10 @@ do_install:append:class-target() { inherit update-alternatives ALTERNATIVE_PRIORITY = "100" ALTERNATIVE:${PN} = "svc svok" + +# http://errors.yoctoproject.org/Errors/Details/766886/ +# pathexec_run.c:19:17: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:19:22: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:18: error: passing argument 2 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +# pathexec_run.c:36:23: error: passing argument 3 of 'execve' from incompatible pointer type [-Wincompatible-pointer-types] +CC += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2_2.0.bb b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2_2.0.bb index aee6bfe3da..5d2e8463e2 100644 --- a/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2_2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/devmem2/devmem2_2.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://devmem2.c;endline=38;md5=a9eb9f3890384519f435aedf9862 SRC_URI = "git://github.com/denix0/devmem2.git;protocol=https;branch=main" SRCREV = "5b395a946894eb4f4ef5d07c80a50a88573a541e" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" CFLAGS += "-DFORCE_STRICT_ALIGNMENT" diff --git a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb index 6eaec800ca..37fe0e1bdc 100644 --- a/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/edid-decode/edid-decode_git.bb @@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=2ef696d66c156139232201f223c22592" SRC_URI= "git://git.linuxtv.org/edid-decode.git;protocol=https;branch=master" SRCREV = "5920bf2a756b2f748c49ff6a08b9f421026473c5" PV = "0.0+git" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb deleted file mode 100644 index 958810cf7a..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" - -DEPENDS = "zlib expat brotli libinih" - -SRC_URI = "https://github.com/Exiv2/${BPN}/releases/download/v${PV}/${BP}-Source.tar.gz" -SRC_URI[sha256sum] = "89af3b5ef7277753ef7a7b5374ae017c6b9e304db3b688f1948e73e103491f3d" -# Once patch is obsolete (project should be aware due to PRs), dos2unix can be removed either -# inherit dos2unix -S = "${WORKDIR}/${BP}-Source" - -inherit cmake gettext - -do_install:append:class-target() { - # reproducibility: remove build host path - sed -i ${D}${libdir}/cmake/exiv2/exiv2Config.cmake \ - -e 's:${STAGING_DIR_HOST}::g' -} diff --git a/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb new file mode 100644 index 0000000000..3e33ab7953 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/exiv2/exiv2_0.28.3.bb @@ -0,0 +1,11 @@ +SUMMARY = "Exif, Iptc and XMP metadata manipulation library and tools" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" + +DEPENDS = "zlib expat brotli libinih" + +SRC_URI = "git://github.com/Exiv2/exiv2.git;protocol=https;branch=0.28.x" +SRCREV = "a6a79ef064f131ffd03c110acce2d3edb84ffa2e" +S = "${WORKDIR}/git" + +inherit cmake gettext diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb index af7117da7b..52122b9c0c 100644 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.10.bb @@ -11,6 +11,8 @@ SRC_URI = " \ " SRC_URI[sha256sum] = "56c932549852cddcfafdab3820b0200c7742675be92179e59e6215b340e26467" +UPSTREAM_CHECK_URI = "http://www.fftw.org/download.html" + inherit autotools pkgconfig ptest # we had multiple recipes in the past diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb index 3e8e2cdf77..322a28430f 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk-native.bb @@ -4,6 +4,8 @@ DEPENDS = "zlib-native jpeg-native libpng-native libxext-native libxft-native" SRC_URI += "file://fltk-native-link-libdl.patch" +UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" + inherit native EXTRA_OECMAKE += " \ diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb index 82007c4cf4..4278a2fa3d 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.bb @@ -7,6 +7,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRC_URI += "file://0003-fluid-CMakeLists.txt-Do-not-export-fluid-target.patch" +UPSTREAM_CHECK_URI = "https://www.fltk.org/software.php" + EXTRA_OECMAKE = " \ -DOPTION_BUILD_SHARED_LIBS=ON \ -DOPTION_USE_THREADS=ON \ diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc index b1bc83578f..0b2921095c 100644 --- a/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc +++ b/meta-openembedded/meta-oe/recipes-support/fltk/fltk.inc @@ -11,8 +11,8 @@ SRC_URI = " \ file://0002-always-build-fluid-and-export-pointers.patch \ " -PV = "1.3.8" -SRC_URI[sha256sum] = "1d9832409fc08c908c64ab40ad9fd8b0e8af5d203651eb9690b810f41e2f412d" +PV = "1.3.9" +SRC_URI[sha256sum] = "103441134915402808fd45424d4061778609437e804334434e946cfd26b196c2" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/fltk/fltk/0001-Fl_Preferences.cxx-do-not-use-dlopen-in-case-glibc-s.patch +++ b/meta-openembedded/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 | ^ | src/CMakeFiles/fltk.dir/build.make:1217: recipe for target 'src/CMakeFiles/fltk.dir/Fl_Preferences.cxx.o' failed -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- Upstream-Status: Pending +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> +--- src/Fl_Preferences.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch b/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch new file mode 100644 index 0000000000..43e905f33a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi/0001-Fix-undeclared-function-errors.patch @@ -0,0 +1,48 @@ +From 3018aa9822c680663ebd19542bcd757dc9baf20a Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 8 Sep 2024 20:16:49 -0700 +Subject: [PATCH] Fix undeclared function errors + +e.g. + +ipmi-sel-string-supermicro-x10dimm-common.c:87:14: error: call to undeclared function 'sel_string_output_supermicro_dimm_event_d + | 87 | if ((ret = sel_string_output_supermicro_dimm_event_data2_event_data3 (ctx, + +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/freeipmi-devel/2024-09/msg00001.html] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + ipmi-sensors/ipmi-sensors-oem-intel.c | 1 + + libfreeipmi/sel/ipmi-sel-string-supermicro-common.h | 9 +++++++++ + 2 files changed, 10 insertions(+) + +diff --git a/ipmi-sensors/ipmi-sensors-oem-intel.c b/ipmi-sensors/ipmi-sensors-oem-intel.c +index 5e0f373..872a730 100644 +--- a/ipmi-sensors/ipmi-sensors-oem-intel.c ++++ b/ipmi-sensors/ipmi-sensors-oem-intel.c +@@ -36,6 +36,7 @@ + #include "ipmi-sensors-oem-intel-s2600jf.h" + #include "ipmi-sensors-oem-intel-quanta-qssc-s4r.h" + #include "ipmi-sensors-oem-intel-node-manager.h" ++#include "ipmi-sensors-oem-intel-s2600wp.h" + + #include "freeipmi-portability.h" + #include "pstdout.h" +diff --git a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +index 5785f2b..9e29bd6 100644 +--- a/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h ++++ b/libfreeipmi/sel/ipmi-sel-string-supermicro-common.h +@@ -39,4 +39,13 @@ int sel_string_output_supermicro_overheat_event_data1_class_oem (ipmi_sel_ctx_t + unsigned int *wlen, + struct ipmi_sel_system_event_record_data *system_event_record_data); + ++int sel_string_output_supermicro_dimm_event_data2_event_data3 (ipmi_sel_ctx_t ctx, ++ struct ipmi_sel_entry *sel_entry, ++ uint8_t sel_record_type, ++ char *buf, ++ unsigned int buflen, ++ unsigned int flags, ++ unsigned int *wlen, ++ struct ipmi_sel_system_event_record_data *system_event_record_data, ++ int *oem_rv); + #endif /* IPMI_SEL_STRING_SUPERMICRO_COMMON_H */ diff --git a/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb b/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb new file mode 100644 index 0000000000..e9b28cee38 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/freeipmi/freeipmi_1.6.14.bb @@ -0,0 +1,26 @@ +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ZRESEARCH;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.bmc-watchdog;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmi-dcmi;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmi-fru;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiconsole;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmidetect;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmimonitoring;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiping;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmipower;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.ipmiseld;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.pstdout;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.sunbmc;md5=c03f21cd76ff5caba6b890d1213cbfbb" + +SRC_URI = "${GNU_MIRROR}/freeipmi/freeipmi-${PV}.tar.gz \ + file://0001-Fix-undeclared-function-errors.patch" +SRC_URI[sha256sum] = "1a3dac5c76b7ccc4d4f86aa12b8ef9b212baef7489bf05e899b89abb7e14edb5" + +DEPENDS = "libgcrypt" +DEPENDS:append:libc-musl = " argp-standalone" + +inherit pkgconfig autotools + +EXTRA_OECONF = "--without-random-device" + diff --git a/meta-openembedded/meta-oe/recipes-support/genimage/genimage_18.bb b/meta-openembedded/meta-oe/recipes-support/genimage/genimage_18.bb new file mode 100644 index 0000000000..23169f5d44 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/genimage/genimage_18.bb @@ -0,0 +1,22 @@ +SUMMARY = "genimage - The image creation tool" +DESCRIPTION = "Genimage is a tool for generating filesystem and disk/flash images \ +from a root filesystem tree or existing filesystem images." +HOMEPAGE = "https://github.com/pengutronix/genimage" + +SECTION = "base" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libconfuse" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/genimage-${PV}.tar.xz" +SRC_URI[sha256sum] = "ebc3f886c4d80064dd6c6d5e3c2e98e5a670078264108ce2f89ada8a2e13fedd" + +EXTRA_OECONF = "--enable-largefile" + +inherit pkgconfig autotools gettext github-releases + +GITHUB_BASE_URI = "https://github.com/pengutronix/genimage/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v?(?P<pver>\d+(\.\d+)*)" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb index 25e5414a35..a066488649 100644 --- a/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb @@ -24,6 +24,10 @@ inherit autotools-brokensep update-rc.d systemd texinfo INITSCRIPT_NAME = "gpm" INITSCRIPT_PARAMS = "defaults" +# Avoid line statements with bison/yacc +# 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] +EXTRA_OEMAKE = "YFLAGS='-l'" + do_configure:prepend() { (cd ${S};./autogen.sh;cd -) } diff --git a/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb index c82b529f96..6238a04d96 100644 --- a/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb +++ b/meta-openembedded/meta-oe/recipes-support/gradm/gradm_3.1-202111052217.bb @@ -18,6 +18,8 @@ SRC_URI = "http://grsecurity.net/stable/${BP}.tar.gz \ " SRC_URI[sha256sum] = "2459290f367a47c8a1ce4ea2ec08359799ea33dc15ed4436439596ce88284fb9" +UPSTREAM_CHECK_URI = "https://grsecurity.net/download" + S = "${WORKDIR}/gradm" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch b/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch index 68d9c3a3cf..0d016ccb4c 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/files/0001-cmake-remove-build-flags.patch @@ -1,6 +1,6 @@ -From 4fa437782261c0da785d4574ad3a03700f624e66 Mon Sep 17 00:00:00 2001 +From 9f5afd99cce93e68996deb2b5fa7c32737d279fe Mon Sep 17 00:00:00 2001 From: Mingli Yu <mingli.yu@windriver.com> -Date: Tue, 19 Sep 2023 02:56:09 +0000 +Date: Tue, 16 Jul 2024 17:54:29 +0800 Subject: [PATCH] cmake: remove build flags Don't generate the build host related info and reemove the build flags @@ -11,11 +11,10 @@ Upstream-Status: Inappropriate [oe specific] Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- config/cmake/libhdf5.settings.cmake.in | 18 +++++++++--------- - src/H5make_libsettings.c | 17 ----------------- - 2 files changed, 9 insertions(+), 26 deletions(-) + 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in -index f60f0de..f4433c0 100644 +index deb07ed..6f255c4 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -23,23 +23,23 @@ Linking Options: @@ -28,7 +27,7 @@ index f60f0de..f4433c0 100644 AM_LDFLAGS: @AM_LDFLAGS@ Extra libraries: @LINK_LIBS@ - Archiver: @CMAKE_AR@ -- AR_FLAGS: +- AR_FLAGS: - Ranlib: @CMAKE_RANLIB@ + Archiver: + AR_FLAGS: @@ -63,34 +62,6 @@ index f60f0de..f4433c0 100644 H5 C++ Flags: @HDF5_CMAKE_CXX_FLAGS@ AM C++ Flags: @AM_CXXFLAGS@ Shared C++ Library: @H5_ENABLE_SHARED_LIB@ -diff --git a/src/H5make_libsettings.c b/src/H5make_libsettings.c -index 2661288..7c0f84f 100644 ---- a/src/H5make_libsettings.c -+++ b/src/H5make_libsettings.c -@@ -205,23 +205,6 @@ information about the library build configuration\n"; - fprintf(rawoutstream, "/* Generated automatically by H5make_libsettings -- do not edit */\n\n\n"); - fputs(FileHeader, rawoutstream); /*the copyright notice--see top of this file */ - -- fprintf(rawoutstream, " *\n * Created:\t\t%s %2d, %4d\n", month_name[tm->tm_mon], tm->tm_mday, -- 1900 + tm->tm_year); -- if (pwd || real_name[0] || host_name[0]) { -- fprintf(rawoutstream, " *\t\t\t"); -- if (real_name[0]) -- fprintf(rawoutstream, "%s <", real_name); --#ifdef H5_HAVE_GETPWUID -- if (pwd) -- fputs(pwd->pw_name, rawoutstream); --#endif -- if (host_name[0]) -- fprintf(rawoutstream, "@%s", host_name); -- if (real_name[0]) -- fprintf(rawoutstream, ">"); -- fputc('\n', rawoutstream); -- } -- - fprintf(rawoutstream, " *\n * Purpose:\t\t"); - - for (s = purpose; *s; s++) { -- -2.35.5 +2.25.1 diff --git a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb index b8a81bb0b7..f34e5f183d 100644 --- a/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/hdf5/hdf5_1.14.4-3.bb @@ -5,18 +5,18 @@ HOMEPAGE = "https://www.hdfgroup.org/" SECTION = "libs" LICENSE = "HDF5" -LIC_FILES_CHKSUM = "file://COPYING;md5=9ba0f3d878ab6c2403c86e9b0362d998" +LIC_FILES_CHKSUM = "file://COPYING;md5=adebb1ecf1b3b80c13359e18ef67301e" inherit cmake siteinfo qemu multilib_header multilib_script DEPENDS += "qemu-native zlib" SRC_URI = " \ - https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-${PV}/src/${BPN}-${PV}.tar.bz2 \ + https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.14/hdf5-1.14.4/src/${BPN}-${PV}.tar.gz \ file://0002-Remove-suffix-shared-from-shared-library-name.patch \ file://0001-cmake-remove-build-flags.patch \ " -SRC_URI[sha256sum] = "ea3c5e257ef322af5e77fc1e52ead3ad6bf3bb4ac06480dd17ee3900d7a24cfb" +SRC_URI[sha256sum] = "019ac451d9e1cf89c0482ba2a06f07a46166caf23f60fea5ef3c37724a318e03" FILES:${PN} += "${libdir}/libhdf5.settings ${datadir}/*" @@ -44,10 +44,13 @@ MULTILIB_SCRIPTS += "${PN}:${bindir}/h5cc \ ${PN}:${bindir}/h5hlcc \ " +do_configure:append() { + sed -i -e 's|${WORKDIR}||g' ${B}/src/libhdf5.settings + sed -i -e 's|${WORKDIR}||g' ${B}/src/H5build_settings.c +} + do_install:append() { # Used for generating config files on target - install -m 755 ${B}/bin/H5detect ${D}${bindir} - install -m 755 ${B}/bin/H5make_libsettings ${D}${bindir} oe_multilib_header H5pubconf.h # remove the buildpath sed -i -e 's|${RECIPE_SYSROOT}||g' ${D}${libdir}/pkgconfig/hdf5.pc diff --git a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb index 0ec426afb9..ed342d6757 100644 --- a/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb +++ b/meta-openembedded/meta-oe/recipes-support/hunspell/hunspell-dictionaries.bb @@ -135,7 +135,10 @@ RDEPENDS:${PN} = "hunspell" PV = "0.0.0+git" SRCREV = "820a65e539e34a3a8c2a855d2450b84745c624ee" -SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=master;protocol=https" +SRC_URI = "git://github.com/wooorm/dictionaries.git;branch=main;protocol=https" + +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.383.bb b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.387.bb index cfa6ae0e45..d73bb93aae 100644 --- a/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.383.bb +++ b/meta-openembedded/meta-oe/recipes-support/hwdata/hwdata_0.387.bb @@ -5,7 +5,7 @@ SECTION = "System/Base" LICENSE = "GPL-2.0-or-later | XFree86-1.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=1556547711e8246992b999edd9445a57" -SRCREV = "229069b51b488bc776602d82315188cd1fbf4887" +SRCREV = "f0ba62c0b0401c215aed8abb42cf7dcdb7e6fecc" SRC_URI = "git://github.com/vcrhonek/${BPN}.git;branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb index 017e7d26a6..b27c2b2e8a 100644 --- a/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/iksemel/iksemel_1.5.bb @@ -11,6 +11,9 @@ SRC_URI = "git://github.com/meduketto/iksemel.git;protocol=https;branch=master \ file://fix-configure-option-parsing.patch \ file://avoid-obsolete-gnutls-apis.patch" +# The current PV is not a git tag but a README content +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit autotools pkgconfig lib_package texinfo diff --git a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb index 61dc1b795e..5407c4e400 100644 --- a/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/imagemagick/imagemagick_7.1.1.bb @@ -100,6 +100,7 @@ ALTERNATIVE_TARGET[montage.1] = "${mandir}/man1/montage.im7.1" ALTERNATIVE_LINK_NAME[stream.1] = "${mandir}/man1/stream.1" ALTERNATIVE_TARGET[stream.1] = "${mandir}/man1/stream.im7.1" +CVE_STATUS[CVE-2007-1667] = "cpe-incorrect: CVE should not include a CPE for imagemagick" CVE_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" CVE_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" CVE_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" @@ -118,4 +119,53 @@ CVE_STATUS[CVE-2014-9818] = "cpe-incorrect: The current version (7.1.1) is not a CVE_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" CVE_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" CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" +CVE_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" diff --git a/meta-openembedded/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb b/meta-openembedded/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb new file mode 100644 index 0000000000..c4b7ce032d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/imx-cst/imx-cst_3.4.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "i.MX code signing tool" +DESCRIPTION = "Code signing support that integrates the HABv4 and AHAB library for i.MX processors" +LICENSE = "BSD-3-Clause & Apache-2.0" + +LIC_FILES_CHKSUM = "\ + file://LICENSE.bsd3;md5=14aba05f9fa6c25527297c8aac95fcf6 \ + file://LICENSE.hidapi;md5=e0ea014f523f64f0adb13409055ee59e \ + file://LICENSE.openssl;md5=3441526b1df5cc01d812c7dfc218cea6 \ +" + +DEPENDS = "byacc-native flex-native openssl" + +# debian: 3.4.0+dfsg-2 +DEBIAN_PGK_NAME = "imx-code-signing-tool" +DEBIAN_PGK_VERSION = "${PV}+dfsg" + +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/i/${DEBIAN_PGK_NAME}/${DEBIAN_PGK_NAME}_${DEBIAN_PGK_VERSION}.orig.tar.xz \ +" + +SRC_URI[sha256sum] = "52ee3cee3bc500a42095f73c4584e223b4b9d2dfc1cd3e5df965c5952eba8c8d" + +S = "${WORKDIR}/${DEBIAN_PGK_NAME}-${DEBIAN_PGK_VERSION}" + +EXTRA_OEMAKE = 'CC="${CC}" LD="${CC}" AR="${AR}" OBJCOPY="${OBJCOPY}"' + +do_compile() { + oe_runmake -C code/obj.linux64 OSTYPE=linux64 ENCRYPTION=yes COPTIONS="${CFLAGS} ${CPPFLAGS}" LDOPTIONS="${LDFLAGS}" + oe_runmake -C add-ons/hab_csf_parser COPTS="${CFLAGS} ${CPPFLAGS} ${LDFLAGS}" +} + +do_install () { + install -d ${D}${bindir} + install -m 755 ${S}/code/obj.linux64/cst ${D}${bindir}/ + install -m 755 ${S}/code/obj.linux64/srktool ${D}${bindir} + install -m 755 ${S}/add-ons/hab_csf_parser/csf_parser ${D}${bindir} +} + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb index 8c6c60a79a..aeac9c30ba 100644 --- a/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.2.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/iniparser/iniparser_4.2.4.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://gitlab.com/iniparser/iniparser" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8474d3b745f77e203f1fc82fb0bb7678" SRCBRANCH = "main" -SRCREV = "762715ca6cdba9dcf31a5af9297b444f3b5b8c00" +SRCREV = "4e5d1cc10215ce328c61bb5fd7839746e47375f9" SRC_URI = "git://gitlab.com/iniparser/iniparser.git;protocol=https;branch=${SRCBRANCH}" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.16.bb b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.16.bb index 22d68814ee..4f35eff90f 100755 --- a/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/lcov/lcov_1.16.bb @@ -50,6 +50,9 @@ SRC_URI = "https://github.com/linux-test-project/lcov/releases/download/v${PV}/l SRC_URI[md5sum] = "bfee0cef50d7b7bd1df03bfadf68dcef" SRC_URI[sha256sum] = "987031ad5528c8a746d4b52b380bc1bffe412de1f2b9c2ba5224995668e3240b" +UPSTREAM_CHECK_URI = "https://github.com/linux-test-project/lcov/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + do_install() { oe_runmake install PREFIX=${D}${prefix} CFG_DIR=${D}${sysconfdir} LCOV_PERL_PATH="/usr/bin/env perl" } diff --git a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb index f747ecbf72..59b26d821e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb +++ b/meta-openembedded/meta-oe/recipes-support/libatasmart/libatasmart_0.19.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1" DEPENDS = "udev" SRCREV = "de6258940960443038b4c1651dfda3620075e870" -SRC_URI = "git://git.0pointer.de/libatasmart.git;branch=master \ +SRC_URI = "git://git.0pointer.net/libatasmart.git;protocol=https;branch=master \ file://0001-Makefile.am-add-CFLAGS-and-LDFLAGS-definiton.patch \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb index daa01bfc3d..214c2b2844 100644 --- a/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.10.bb +++ b/meta-openembedded/meta-oe/recipes-support/libbytesize/libbytesize_2.11.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" S = "${WORKDIR}/git" -SRCREV = "6e83cc6f6dff4f126fc79284e0c3c1c50123380d" +SRCREV = "9da72b2732508b0ba0ceed27f5e50bc276ef31f2" SRC_URI = "git://github.com/storaged-project/libbytesize;branch=main;protocol=https" inherit gettext autotools pkgconfig python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libcereal/files/0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch @@ -0,0 +1,41 @@ +From 395cd70a8c28a4ea408a227d745fe20ed8af9105 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 10 Sep 2024 18:11:40 -0700 +Subject: [PATCH] Fix instances of + -Wmissing-template-arg-list-after-template-kw. + +Clang has a new warning that requires a template argument list after using +the template keyword. Remove uses of the template keyword when we're not +specifying types. + +See https://github.com/llvm/llvm-project/issues/94194 for the upstream +clang changes + +Upstream-Status: Submitted [https://github.com/USCiLab/cereal/pull/835] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/cereal/types/tuple.hpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/include/cereal/types/tuple.hpp b/include/cereal/types/tuple.hpp +index 80c68075..5c79eca9 100644 +--- a/include/cereal/types/tuple.hpp ++++ b/include/cereal/types/tuple.hpp +@@ -95,7 +95,7 @@ namespace cereal + template <class Archive, class ... Types> inline + static void apply( Archive & ar, std::tuple<Types...> & tuple ) + { +- serialize<Height - 1>::template apply( ar, tuple ); ++ serialize<Height - 1>::apply( ar, tuple ); + ar( CEREAL_NVP_(tuple_element_name<Height - 1>::c_str(), + std::get<Height - 1>( tuple )) ); + } +@@ -116,7 +116,7 @@ namespace cereal + template <class Archive, class ... Types> inline + void CEREAL_SERIALIZE_FUNCTION_NAME( Archive & ar, std::tuple<Types...> & tuple ) + { +- tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::template apply( ar, tuple ); ++ tuple_detail::serialize<std::tuple_size<std::tuple<Types...>>::value>::apply( ar, tuple ); + } + } // namespace cereal + diff --git a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb index 6ad20d6370..c2ab0d61b8 100644 --- a/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libcereal/libcereal_1.3.2.bb @@ -22,6 +22,7 @@ SRC_URI = "git://github.com/USCiLab/cereal.git;branch=master;protocol=https \ file://0001-sandbox-Do-not-use-int8_t-in-std-uniform_int_distrib.patch \ file://0001-cmake-Use-idirafter-instead-of-isystem.patch \ file://0001-doctest-Do-not-use-unnamed-class.patch \ + file://0001-Fix-instances-of-Wmissing-template-arg-list-after-te.patch \ file://run-ptest \ " diff --git a/meta-openembedded/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libconfuse/files/0001-only-apply-search-path-logic-to-relative-pathnames.patch @@ -0,0 +1,48 @@ +From b684f4cc25821b6e86a58576f864e4b12dfdfecc Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes <rasmus.villemoes@prevas.dk> +Date: Sat, 5 Jun 2021 22:57:51 +0200 +Subject: [PATCH] only apply search path logic to relative pathnames + +Adding any directory to the search path via cfg_add_searchpath breaks +lookup of absolute paths. So change the logic in cfg_searchpath() to +ignore the search path when the given filename is absolute, and merely +check that for existence. + +This is technically an ABI change, but the current behaviour is quite +unusual and unexpected. + +Upstream-Status: Backport [https://github.com/libconfuse/libconfuse/pull/155] + +Signed-off-by: Rasmus Villemoes <rasmus.villemoes@prevas.dk> +--- + src/confuse.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/confuse.c b/src/confuse.c +index 2ea0254..19b56e3 100644 +--- a/src/confuse.c ++++ b/src/confuse.c +@@ -1746,12 +1746,20 @@ DLLIMPORT char *cfg_searchpath(cfg_searchpath_t *p, const char *file) + return NULL; + } + ++ if (file[0] == '/') { ++ fullpath = strdup(file); ++ if (!fullpath) ++ return NULL; ++ goto check; ++ } ++ + if ((fullpath = cfg_searchpath(p->next, file)) != NULL) + return fullpath; + + if ((fullpath = cfg_make_fullpath(p->dir, file)) == NULL) + return NULL; + ++check: + #ifdef HAVE_SYS_STAT_H + err = stat((const char *)fullpath, &st); + if ((!err) && S_ISREG(st.st_mode)) +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb b/meta-openembedded/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb new file mode 100644 index 0000000000..e6f28c7b69 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libconfuse/libconfuse_3.3.bb @@ -0,0 +1,14 @@ +SUMMARY = "libConfuse is a configuration file parser library" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://LICENSE;md5=42fa47330d4051cd219f7d99d023de3a" + +SRC_URI = "https://github.com/libconfuse/libconfuse/releases/download/v${PV}/confuse-${PV}.tar.gz" +SRC_URI[sha256sum] = "3a59ded20bc652eaa8e6261ab46f7e483bc13dad79263c15af42ecbb329707b8" + +SRC_URI += "file://0001-only-apply-search-path-logic-to-relative-pathnames.patch" + +inherit autotools-brokensep pkgconfig gettext + +S = "${WORKDIR}/confuse-${PV}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/libee/libee.inc b/meta-openembedded/meta-oe/recipes-support/libee/libee.inc deleted file mode 100644 index 592109b951..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libee/libee.inc +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "An Event Expression Library inspired by CEE" -DESCRIPTION = "The core idea of libee is to provide a small \ -but hopefully convenient API layer above the CEE standard." - -HOMEPAGE = "http://www.libee.org" -SECTION = "base" - -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=1c2687de35e36ba3b999136236a66cd6" - -SRC_URI = "http://www.libee.org/download/files/download/${BPN}-${PV}.tar.gz\ - file://libee-parallel-make.patch \ - file://run-ptest \ - file://ezapi1.sh \ -" - -inherit autotools ptest pkgconfig - -DEPENDS += "libestr" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'testbench', '', d)}" - -PACKAGECONFIG[debug] = "--enable-debug,--disable-debug,," -PACKAGECONFIG[testbench] = "--enable-testbench,--disable-testbench,," - -TESTDIR = "tests" - -# We presume the tests we are going to install so just build them directly. -# -do_compile_ptest() { - oe_runmake -C ${TESTDIR} genfile ezapi1 -} - -do_install_ptest() { - install -d ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/genfile ${D}${PTEST_PATH} - install -m 0755 ${B}/${TESTDIR}/.libs/ezapi1 ${D}${PTEST_PATH} - install -m 0755 ${UNPACKDIR}/ezapi1.sh ${D}${PTEST_PATH} -} diff --git a/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh b/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh deleted file mode 100755 index e9db5e614b..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libee/libee/ezapi1.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# -echo --------------------------------------------------------------------------- -echo A very basic test for the event class -echo --------------------------------------------------------------------------- -rm -f infile -./genfile 100 > infile -./ezapi1 -iinfile -if [ $? -ne 0 ] ; then - echo "FAIL: $0" - exit 1 -fi -echo "PASS: $0" -rm -f infile diff --git a/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch b/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch deleted file mode 100644 index 8bb23aafca..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libee/libee/libee-parallel-make.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix parallel compiling problem - -without specifying libee_convert_DEPENDENCIES = libee.la, libee_convert -can't find libee.la when linking as libee is not generated yet. - -Upstream-Status: Pending - -Signed-off-by: Yao Zhao <yao.zhao@windriver.com> ---- -diff --git a/src/Makefile.am b/src/Makefile.am -index 08aaa9e..f0c78f7 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -46,5 +46,6 @@ libee_la_LDFLAGS = -version-info 0:0:0 - libee_convert_SOURCES = convert.c - libee_convert_CPPFLAGS = -I$(top_srcdir) $(LIBEE_CFLAGS) $(LIBESTR_CFLAGS) $(LIBXML2_CFLAGS) - libee_convert_LDADD = $(LIBEE_LIBS) $(LIBXML2_LIBS) $(LIBESTR_LIBS) -+libee_convert_DEPENDENCIES = libee.la - - include_HEADERS = diff --git a/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest b/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest deleted file mode 100755 index 3cb6607645..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libee/libee/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# -./ezapi1.sh diff --git a/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb b/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb deleted file mode 100644 index ef2c20db5a..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libee/libee_0.4.1.bb +++ /dev/null @@ -1,4 +0,0 @@ -require ${BPN}.inc - -SRC_URI[md5sum] = "7bbf4160876c12db6193c06e2badedb2" -SRC_URI[sha256sum] = "c0dac01938593deee06c3d161e4eda4ecc0fd7317e1321bd96e301aceb7fb027" diff --git a/meta-openembedded/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb b/meta-openembedded/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb index d453d0ab97..74844855d9 100644 --- a/meta-openembedded/meta-oe/recipes-support/libfido2/libfido2_1.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libfido2/libfido2_1.15.0.bb @@ -7,10 +7,10 @@ LICENSE = "BSD-2-Clause" SECTION = "libs/network" DEPENDS = "libcbor openssl zlib udev" -LIC_FILES_CHKSUM = "file://LICENSE;md5=5f14cb32bdf2b87063e0a2d20c4178d0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=20be19aaa222f71738712b26f7f8717b" SRC_URI = "https://developers.yubico.com/${BPN}/Releases/${BPN}-${PV}.tar.gz" -SRC_URI[sha256sum] = "3601792e320032d428002c4cce8499a4c7b803319051a25a0c9f1f138ffee45a" +SRC_URI[sha256sum] = "abaab1318d21d262ece416fb8a7132fa9374bda89f6fa52b86a98a2f5712b61e" inherit cmake pkgconfig manpages diff --git a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.5.bb b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.5.bb index eae1c02f04..24dc5b2288 100644 --- a/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/libftdi/libftdi_1.5.bb @@ -14,6 +14,8 @@ DEPENDS = "libusb1 python3 swig-native" SRC_URI = "http://www.intra2net.com/en/developer/${BPN}/download/${BPN}1-${PV}.tar.bz2" SRC_URI[sha256sum] = "7c7091e9c86196148bd41177b4590dccb1510bfe6cea5bf7407ff194482eb049" +UPSTREAM_CHECK_URI = "http://www.intra2net.com/en/developer/libftdi/download.php" + S = "${WORKDIR}/${BPN}1-${PV}" inherit cmake binconfig pkgconfig python3native diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb index b4665c1567..6130371e4e 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_2.1.3.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = " \ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}-2.x:" SRC_URI += "file://0001-bindings-cxx-Migrate-C-tests-to-use-Catch2-v3.patch" -SRC_URI[sha256sum] = "7a148a5a7d1c97a1abb40474b9a392b6edd7a42fe077dfd7ff42cfba24308548" +SRC_URI[sha256sum] = "2be4c0b03e995d236c0e476e14aeb475d7b431dd1439609b6d65c540f91eaf58" # Enable all project features for ptest PACKAGECONFIG[tests] = "--enable-tests --enable-tools --enable-bindings-cxx --enable-gpioset-interactive,--disable-tests,kmod util-linux glib-2.0 catch2 libedit" diff --git a/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb b/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb index ff976ed975..644c3ba07b 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.15.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiodbc/libiodbc_3.52.16.bb @@ -9,11 +9,14 @@ HOMEPAGE = "http://www.iodbc.org/" LICENSE = "LGPL-2.0-only | BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.LGPL;md5=8c0138a8701f0e1282f5c8b2c7d39114 \ - file://LICENSE.BSD;md5=ff3a66a194e500df485da930da7f2c62 \ + file://LICENSE.BSD;md5=5b36348a404e1d65b57df8d33fd6e414 \ " SRC_URI = "https://github.com/openlink/iODBC/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "c74541e3327fc9a1c7ccf103645471c67bc014542d70f572476eb07c0b2dd43c" +SRC_URI[sha256sum] = "3898b32d07961360f6f2cf36db36036b719a230e476469258a80f32243e845fa" + +UPSTREAM_CHECK_URI = "https://github.com/openlink/iODBC/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb index 4f0d8e5548..68b5086701 100644 --- a/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/libjs/libjs-jquery_3.3.1.bb @@ -7,6 +7,9 @@ SRC_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/${BPN}_${PV}~d SRC_URI[sha256sum] = "e04d192c2356e9d4c2b2c7d83fde9408713212b53c4d106e5b9e46c1a56da33b" +UPSTREAM_CHECK_URI = "http://kr.archive.ubuntu.com/ubuntu/pool/main/j/jquery/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + JQUERYDIR = "${datadir}/javascript/jquery" JQUERYDOCDIR = "${docdir}/libjs-jquery" diff --git a/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb b/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb deleted file mode 100644 index d0463a640d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/liblinebreak/liblinebreak_1.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -DESCRIPTION = "Liblinebreak is an implementation of the line breaking algorithm as described in Unicode 5.1.0 Standard Annex 14, Revision 22" -HOMEPAGE = "http://vimgadgets.sourceforge.net/liblinebreak/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENCE;md5=3715191da62bafb5cfc4ff36195b2ec3" - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/vimgadgets/liblinebreak/${PV}/liblinebreak-${PV}.tar.gz" -SRC_URI[md5sum] = "d18039259001ccb24b5dd4648c49c5ad" -SRC_URI[sha256sum] = "9efcb0cb1afc75ad1e92d2b2dbf4d9c77b072d6656c5f1a150af8b718d0c7b76" - -inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb index db05422699..2e59401892 100644 --- a/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/libmanette/libmanette_0.2.9.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" DEPENDS = "libevdev libgudev" SRC_URI = "https://download.gnome.org/sources/libmanette/0.2/libmanette-${PV}.tar.xz" -SRC_URI[sha256sum] = "cddd5c02a131072c19c6cde6f2cb2cd57eae7dacb50d14c337efd980baa51a51" +SRC_URI[sha256sum] = "29366be5452f60a74c65fc64ffe2d74eddd4e6e6824c2cefa567a43bd92b688f" inherit meson pkgconfig gobject-introspection ptest vala diff --git a/meta-openembedded/meta-oe/recipes-support/libnice/libnice_0.1.22.bb b/meta-openembedded/meta-oe/recipes-support/libnice/libnice_0.1.22.bb index 175e10fdf6..4b932029ee 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnice/libnice_0.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnice/libnice_0.1.22.bb @@ -11,6 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9c42325015702feda4f4d2f19a55b767 \ SRC_URI = "http://nice.freedesktop.org/releases/${BP}.tar.gz" SRC_URI[sha256sum] = "a5f724cf09eae50c41a7517141d89da4a61ec9eaca32da4a0073faed5417ad7e" +UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/libnice/libnice/-/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + DEPENDS = "glib-2.0 gnutls ${@bb.utils.contains('DISTRO_FEATURES', 'api-documentation', 'graphviz-native', '', d)}" PACKAGECONFIG[gupnp] = "-Dgupnp=enabled,-Dgupnp=disabled,gupnp" diff --git a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.9.bb b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.10.bb index 1e03b4e7ad..a05d1168ef 100644 --- a/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libnvme/libnvme_1.10.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" DEPENDS = "json-c" -SRCREV = "80c5cf2aa45f4afc7571dc48850fae3fd62828af" +SRCREV = "dd51fa8550564c93436423a4d8ed4be92ae50290" SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb index 8ef7ac3df0..727d5ecf89 100644 --- a/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/libosinfo_1.11.0.bb @@ -32,4 +32,4 @@ EXTRA_OEMESON += " \ -Dwith-usb-ids-path=${datadir}/hwdata/usb.ids \ " -RDEPENDS:${PN} = "hwdata" +RDEPENDS:${PN} = "hwdata osinfo-db" diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch new file mode 100644 index 0000000000..edff5732c6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools/0001-Make-xmlError-structs-constant.patch @@ -0,0 +1,56 @@ +Upstream-Status: Backport [https://gitlab.com/libosinfo/osinfo-db-tools/-/commit/34378a4] + +Signed-off-by: Kai Kang <kai.kang@windriver.com> + +From 34378a4ac257f2f5fcf364786d1634a8c36b304f Mon Sep 17 00:00:00 2001 +From: Michal Privoznik <mprivozn@redhat.com> +Date: Mon, 27 Nov 2023 15:04:43 +0100 +Subject: [PATCH] Make xmlError structs constant + +In libxml2 commits v2.12.0~14 and v2.12.0~77 the API changed so +that: + +1) xmlGetLastError() returns pointer to a constant xmlError + struct, and + +2) xmlSetStructuredErrorFunc() changed the signature of callback + (validate_structured_error_nop()), it too is passed pointer to + a constant xmlError struct. + +But of course, older libxml2 expects different callback +signature. Therefore, we need to typecast it anyway. + +Also, drop obviously incorrect @error annotation in +validate_structured_error_nop; the variable is used. + +Signed-off-by: Michal Privoznik <mprivozn@redhat.com> +--- + tools/osinfo-db-validate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tools/osinfo-db-validate.c b/tools/osinfo-db-validate.c +index a721b4d..b1434a6 100644 +--- a/tools/osinfo-db-validate.c ++++ b/tools/osinfo-db-validate.c +@@ -35,7 +35,7 @@ static void validate_generic_error_nop(void *userData G_GNUC_UNUSED, + } + + static void validate_structured_error_nop(void *userData G_GNUC_UNUSED, +- xmlErrorPtr error G_GNUC_UNUSED) ++ const xmlError *error) + { + if (error->file) + g_printerr("%s:%d %s", error->file, error->line, error->message); +@@ -173,7 +173,8 @@ static gboolean validate_files(GFile *schema, gsize nfiles, GFile **files, GErro + g_autofree gchar *schemapath = NULL; + + xmlSetGenericErrorFunc(NULL, validate_generic_error_nop); +- xmlSetStructuredErrorFunc(NULL, validate_structured_error_nop); ++ /* Drop this typecast when >=libxml2-2.12.0 is required */ ++ xmlSetStructuredErrorFunc(NULL, (xmlStructuredErrorFunc) validate_structured_error_nop); + + schemapath = g_file_get_path(schema); + rngParser = xmlRelaxNGNewParserCtxt(schemapath); +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb new file mode 100644 index 0000000000..0584bee15c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db-tools_1.11.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "Tools for managing the libosinfo database files" +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "glib-2.0 json-glib libarchive libsoup-2.4" + +SRC_URI = "git://gitlab.com/libosinfo/osinfo-db-tools.git;branch=main;protocol=https \ + file://0001-Make-xmlError-structs-constant.patch \ + " +SRCREV = "85a1788c6977419b6facad11dbfbf823e739eb3b" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb new file mode 100644 index 0000000000..d369046055 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libosinfo/osinfo-db_20240701.bb @@ -0,0 +1,21 @@ +SUMMARY = "osinfo-db provides the database files for use with the libosinfo library" +HOMEPAGE = "https://libosinfo.org" + +LICENSE = "GPL-2.0-or-later" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS = "osinfo-db-tools-native" + +SRC_URI = "git://gitlab.com/libosinfo/osinfo-db.git;branch=main;protocol=https" + +SRCREV = "cde78484ab747c87532d47cf3f09b76f280c0b74" + +S = "${WORKDIR}/git" + +inherit allarch autotools-brokensep + +EXTRA_OEMAKE = "OSINFO_DB_TARGET='--dir ${datadir}/osinfo'" + +do_configure[noexec] = "1" + +FILES:${PN} = "${datadir}/osinfo" diff --git a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb index a45ffe1849..3b0e1bf0dd 100644 --- a/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.1.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libpaper/libpaper_2.2.5.bb @@ -2,7 +2,10 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "https://github.com/rrthomas/libpaper/releases/download/v${PV}/libpaper-${PV}.tar.gz" -SRC_URI[sha256sum] = "1fda0cf64efa46b9684a4ccc17df4386c4cc83254805419222c064bf62ea001f" +SRC_URI[sha256sum] = "7be50974ce0df0c74e7587f10b04272cd53fd675cb6a1273ae1cc5c9cc9cab09" + +UPSTREAM_CHECK_URI = "https://github.com/rrthomas/libpaper/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" inherit perlnative autotools diff --git a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb index 4d089f3b79..6b1355fa37 100644 --- a/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/libraw/libraw_0.21.2.bb @@ -9,3 +9,6 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig DEPENDS = "jpeg jasper lcms" + +CVE_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" +CVE_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-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb index 1f7442af07..0dda756dd7 100644 --- a/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/libsmi/libsmi_0.5.0.bb @@ -14,6 +14,9 @@ SRC_URI = "https://www.ibr.cs.tu-bs.de/projects/${BPN}/download/${BP}.tar.gz \ SRC_URI[md5sum] = "4bf47483c06c9f07d1b10fbc74eddf11" SRC_URI[sha256sum] = "f21accdadb1bb328ea3f8a13fc34d715baac6e2db66065898346322c725754d3" +UPSTREAM_CHECK_URI = "https://repology.org/project/libsmi/information" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + DEPENDS += "bison-native flex-native wget-native gawk-native" inherit autotools-brokensep update-alternatives diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libssh/libssh/0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch @@ -0,0 +1,37 @@ +From 98a330971f4344619b698d4603a45bd31d6935d9 Mon Sep 17 00:00:00 2001 +From: Yi Zhao <yi.zhao@windriver.com> +Date: Sun, 15 Sep 2024 20:31:55 +0800 +Subject: [PATCH] CompilerChecks.cmake: drop -Wunused-variable flag + +Drop -Wunused-variable flag to fix build with clang: + +libssh/0.11.1/git/src/threads/libgcrypt.c:29:1: error: unused variable 'gcry_threads_pthread' [-Werror,-Wunused-variable] + 29 | GCRY_THREAD_OPTION_PTHREAD_IMPL; + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +libssh/0.11.1/recipe-sysroot/usr/include/gcrypt.h:217:33: note: expanded from macro 'GCRY_THREAD_OPTION_PTHREAD_IMPL' + 217 | static struct gcry_thread_cbs gcry_threads_pthread = { \ + | ^~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Inappropriate [embedded specific] + +Signed-off-by: Yi Zhao <yi.zhao@windriver.com> +--- + CompilerChecks.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CompilerChecks.cmake b/CompilerChecks.cmake +index 9719e699..ec15fa2a 100644 +--- a/CompilerChecks.cmake ++++ b/CompilerChecks.cmake +@@ -48,7 +48,7 @@ if (UNIX) + add_c_compiler_flag("-Werror=implicit-int" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Wint-conversion" SUPPORTED_COMPILER_FLAGS) + add_c_compiler_flag("-Werror=int-conversion" SUPPORTED_COMPILER_FLAGS) +- add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) ++ #add_c_compiler_flag("-Werror=unused-variable" SUPPORTED_COMPILER_FLAGS) + + check_c_compiler_flag("-Wformat" REQUIRED_FLAGS_WFORMAT) + if (REQUIRED_FLAGS_WFORMAT) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libssh/libssh/0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 49a8ae4d6f77434ed9f7a601b9df488b921e4a22 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 20 Mar 2023 21:59:19 -0700 -Subject: [PATCH] libgcrypt.c: Fix prototype of des3_encrypt/des3_decrypt - -This is to match the prototype for callback functions which are now emitted as -errors by clang16 - -Fixes - -TOPDIR/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] - .encrypt = des3_encrypt, - ^~~~~~~~~~~~ -TOPDIR/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] - .decrypt = des3_decrypt - ^~~~~~~~~~~~ - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- - src/libgcrypt.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/libgcrypt.c b/src/libgcrypt.c -index f410d997..e3f66781 100644 ---- a/src/libgcrypt.c -+++ b/src/libgcrypt.c -@@ -416,12 +416,12 @@ static int des3_set_key(struct ssh_cipher_struct *cipher, void *key, void *IV) { - } - - static void des3_encrypt(struct ssh_cipher_struct *cipher, void *in, -- void *out, unsigned long len) { -+ void *out, size_t len) { - gcry_cipher_encrypt(cipher->key[0], out, len, in, len); - } - - static void des3_decrypt(struct ssh_cipher_struct *cipher, void *in, -- void *out, unsigned long len) { -+ void *out, size_t len) { - gcry_cipher_decrypt(cipher->key[0], out, len, in, len); - } - diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch index d6bc75c3a6..4803ff81d8 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh/0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch @@ -1,4 +1,4 @@ -From 69a89e8f015802f61637fed0d3791d20a594f298 Mon Sep 17 00:00:00 2001 +From 99fcb71903cca8458bcd6c0d5b676619a9710dab Mon Sep 17 00:00:00 2001 From: Yi Zhao <yi.zhao@windriver.com> Date: Wed, 15 Mar 2023 16:51:58 +0800 Subject: [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. Upstream-Status: Inappropriate [embedded specific] Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - --- tests/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index f5c30061..885c926a 100644 +index 89b95d08..e481534c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt -@@ -86,6 +86,7 @@ set(TEST_TARGET_LIBRARIES +@@ -96,6 +96,7 @@ set(TEST_TARGET_LIBRARIES add_subdirectory(unittests) @@ -26,11 +25,14 @@ index f5c30061..885c926a 100644 # OpenSSH Capabilities are required for all unit tests find_program(SSH_EXECUTABLE NAMES ssh) if (SSH_EXECUTABLE) -@@ -302,6 +303,7 @@ if (CLIENT_TESTING OR SERVER_TESTING) +@@ -345,6 +346,7 @@ endif (WITH_PKCS11_URI) + file(COPY gss/kdcsetup.sh DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/gss FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE) - message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") - endif () + message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") +endif () configure_file(tests_config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/tests_config.h) +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.11.1.bb index 31f29c1b7d..5f39c2d79c 100644 --- a/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.10.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/libssh/libssh_0.11.1.bb @@ -6,12 +6,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dabb4958b830e5df11d2b0ed8ea255a0" DEPENDS = "zlib openssl" -SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.10 \ +SRC_URI = "git://git.libssh.org/projects/libssh.git;protocol=https;branch=stable-0.11 \ file://0001-tests-CMakeLists.txt-do-not-search-ssh-sshd-commands.patch \ - file://0001-libgcrypt.c-Fix-prototype-of-des3_encrypt-des3_decry.patch \ file://run-ptest \ " -SRCREV = "10e09e273f69e149389b3e0e5d44b8c221c2e7f6" + +SRC_URI:append:toolchain-clang = " file://0001-CompilerChecks.cmake-drop-Wunused-variable-flag.patch" + +SRCREV = "854795c654eda518ed6de6c1ebb4e2107fcb2e73" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch b/meta-openembedded/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch new file mode 100644 index 0000000000..f0fd2a4aa1 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libtar/files/0003-Fix-missing-prototype-compiler-warnings.patch @@ -0,0 +1,53 @@ +From 9426ac3d232e2f90c571979a2166c5e1328967d1 Mon Sep 17 00:00:00 2001 +From: Hans de Goede <j.w.r.degoede@hhs.nl> +Date: Tue, 15 Oct 2013 14:39:04 +0200 +Subject: [PATCH] Fix missing prototype compiler warnings + +Signed-off-by: Kamil Dudka <kdudka@redhat.com> + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/30e5556d1c9323e9f1887b28d42581c2954b53c9] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/append.c | 2 ++ + lib/output.c | 1 + + lib/wrapper.c | 1 + + 3 files changed, 4 insertions(+) + +diff --git a/lib/append.c b/lib/append.c +index 13e1ace..e8bd89d 100644 +--- a/lib/append.c ++++ b/lib/append.c +@@ -13,6 +13,8 @@ + #include <internal.h> + + #include <stdio.h> ++#include <stdlib.h> ++#include <string.h> + #include <errno.h> + #include <fcntl.h> + #include <sys/param.h> +diff --git a/lib/output.c b/lib/output.c +index a2db929..a5262ee 100644 +--- a/lib/output.c ++++ b/lib/output.c +@@ -13,6 +13,7 @@ + #include <internal.h> + + #include <stdio.h> ++#include <stdlib.h> + #include <pwd.h> + #include <grp.h> + #include <time.h> +diff --git a/lib/wrapper.c b/lib/wrapper.c +index 4cd0652..44cc435 100644 +--- a/lib/wrapper.c ++++ b/lib/wrapper.c +@@ -13,6 +13,7 @@ + #include <internal.h> + + #include <stdio.h> ++#include <stdlib.h> + #include <sys/param.h> + #include <dirent.h> + #include <errno.h> diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0004-Fix-invalid-memory-de-reference-issue.patch @@ -0,0 +1,44 @@ +From c0a89709860acae5ef67727db7b23db385703bf6 Mon Sep 17 00:00:00 2001 +From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org> +Date: Tue, 15 Oct 2013 14:39:05 +0200 +Subject: [PATCH] Fix invalid memory de-reference issue + +Bug: https://bugzilla.redhat.com/551415 + +Signed-off-by: Kamil Dudka <kdudka@redhat.com> + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/560911b694055b0c677431cf85d4d0d5ebd1a3fd] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/libtar.h | 1 + + lib/util.c | 4 +--- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/lib/libtar.h b/lib/libtar.h +index 55f509a..7fc4d03 100644 +--- a/lib/libtar.h ++++ b/lib/libtar.h +@@ -172,6 +172,7 @@ int th_write(TAR *t); + #define TH_ISDIR(t) ((t)->th_buf.typeflag == DIRTYPE \ + || S_ISDIR((mode_t)oct_to_int((t)->th_buf.mode)) \ + || ((t)->th_buf.typeflag == AREGTYPE \ ++ && strlen((t)->th_buf.name) \ + && ((t)->th_buf.name[strlen((t)->th_buf.name) - 1] == '/'))) + #define TH_ISFIFO(t) ((t)->th_buf.typeflag == FIFOTYPE \ + || S_ISFIFO((mode_t)oct_to_int((t)->th_buf.mode))) +diff --git a/lib/util.c b/lib/util.c +index 31e8315..11438ef 100644 +--- a/lib/util.c ++++ b/lib/util.c +@@ -148,9 +148,7 @@ oct_to_int(char *oct) + { + int i; + +- sscanf(oct, "%o", &i); +- +- return i; ++ return sscanf(oct, "%o", &i) == 1 ? i : 0; + } + + diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch @@ -0,0 +1,101 @@ +From d998b9f75c79aab68255dace641dd30db239eff6 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Tue, 15 Oct 2013 19:48:41 -0400 +Subject: [PATCH] fix file descriptor leaks reported by cppcheck + +Bug: https://bugzilla.redhat.com/785760 + +Authored by Kamil Dudka <kdudka@redhat.com>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/abd0274e6b2f708e9eaa29414b07b3f542cec694] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/append.c | 14 +++++++++----- + lib/extract.c | 4 ++++ + libtar/libtar.c | 3 +++ + 3 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/lib/append.c b/lib/append.c +index e8bd89d..ff58532 100644 +--- a/lib/append.c ++++ b/lib/append.c +@@ -216,6 +216,7 @@ tar_append_regfile(TAR *t, const char *realname) + int filefd; + int i, j; + size_t size; ++ int rv = -1; + + filefd = open(realname, O_RDONLY); + if (filefd == -1) +@@ -234,25 +235,28 @@ tar_append_regfile(TAR *t, const char *realname) + { + if (j != -1) + errno = EINVAL; +- return -1; ++ goto fail; + } + if (tar_block_write(t, &block) == -1) +- return -1; ++ goto fail; + } + + if (i > 0) + { + j = read(filefd, &block, i); + if (j == -1) +- return -1; ++ goto fail; + memset(&(block[i]), 0, T_BLOCKSIZE - i); + if (tar_block_write(t, &block) == -1) +- return -1; ++ goto fail; + } + ++ /* success! */ ++ rv = 0; ++fail: + close(filefd); + +- return 0; ++ return rv; + } + + +diff --git a/lib/extract.c b/lib/extract.c +index 36357e7..9fc6ad5 100644 +--- a/lib/extract.c ++++ b/lib/extract.c +@@ -228,13 +228,17 @@ tar_extract_regfile(TAR *t, char *realname) + { + if (k != -1) + errno = EINVAL; ++ close(fdout); + return -1; + } + + /* write block to output file */ + if (write(fdout, buf, + ((i > T_BLOCKSIZE) ? T_BLOCKSIZE : i)) == -1) ++ { ++ close(fdout); + return -1; ++ } + } + + /* close output file */ +diff --git a/libtar/libtar.c b/libtar/libtar.c +index 9fa92b2..bb5644c 100644 +--- a/libtar/libtar.c ++++ b/libtar/libtar.c +@@ -83,7 +83,10 @@ gzopen_frontend(char *pathname, int oflags, int mode) + return -1; + + if ((oflags & O_CREAT) && fchmod(fd, mode)) ++ { ++ close(fd); + return -1; ++ } + + gzf = gzdopen(fd, gzoflags); + if (!gzf) diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0006-fix-memleak-on-tar_open-failure.patch @@ -0,0 +1,26 @@ +From f6c5cba59444ecda9bbc22b8e8e57fd1015a688d Mon Sep 17 00:00:00 2001 +From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org> +Date: Tue, 15 Oct 2013 20:02:58 -0400 +Subject: [PATCH] fix memleak on tar_open() failure + +Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/36629a41208375f5105427e98078127551692028] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/handle.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/handle.c b/lib/handle.c +index 33a262c..002d23c 100644 +--- a/lib/handle.c ++++ b/lib/handle.c +@@ -82,6 +82,7 @@ tar_open(TAR **t, const char *pathname, tartype_t *type, + (*t)->fd = (*((*t)->type->openfunc))(pathname, oflags, mode); + if ((*t)->fd == -1) + { ++ libtar_hash_free((*t)->h, NULL); + free(*t); + return -1; + } diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0007-fix-memleaks-in-libtar-sample-program.patch @@ -0,0 +1,119 @@ +From e3888e452aee72e0d658185ac20e8e63bed1aff8 Mon Sep 17 00:00:00 2001 +From: Huzaifa Sidhpurwala <huzaifas@fedoraproject.org> +Date: Tue, 15 Oct 2013 20:05:04 -0400 +Subject: [PATCH] fix memleaks in libtar sample program + +Authored by Huzaifa Sidhpurwala <huzaifas@fedoraproject.org>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/f3c711cf3054ff366a1a3500cdc8c64ecc2d2da6] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + libtar/libtar.c | 29 ++++++++++++++++++----------- + 1 file changed, 18 insertions(+), 11 deletions(-) + +diff --git a/libtar/libtar.c b/libtar/libtar.c +index bb5644c..23f8741 100644 +--- a/libtar/libtar.c ++++ b/libtar/libtar.c +@@ -253,6 +253,7 @@ extract(char *tarfile, char *rootdir) + if (tar_extract_all(t, rootdir) != 0) + { + fprintf(stderr, "tar_extract_all(): %s\n", strerror(errno)); ++ tar_close(t); + return -1; + } + +@@ -270,12 +271,13 @@ extract(char *tarfile, char *rootdir) + + + void +-usage() ++usage(void *rootdir) + { + printf("Usage: %s [-C rootdir] [-g] [-z] -x|-t filename.tar\n", + progname); + printf(" %s [-C rootdir] [-g] [-z] -c filename.tar ...\n", + progname); ++ free(rootdir); + exit(-1); + } + +@@ -292,6 +294,7 @@ main(int argc, char *argv[]) + int c; + int mode = 0; + libtar_list_t *l; ++ int return_code = -2; + + progname = basename(argv[0]); + +@@ -313,17 +316,17 @@ main(int argc, char *argv[]) + break; + case 'c': + if (mode) +- usage(); ++ usage(rootdir); + mode = MODE_CREATE; + break; + case 'x': + if (mode) +- usage(); ++ usage(rootdir); + mode = MODE_EXTRACT; + break; + case 't': + if (mode) +- usage(); ++ usage(rootdir); + mode = MODE_LIST; + break; + #ifdef HAVE_LIBZ +@@ -332,7 +335,7 @@ main(int argc, char *argv[]) + break; + #endif /* HAVE_LIBZ */ + default: +- usage(); ++ usage(rootdir); + } + + if (!mode || ((argc - optind) < (mode == MODE_CREATE ? 2 : 1))) +@@ -341,7 +344,7 @@ main(int argc, char *argv[]) + printf("argc - optind == %d\tmode == %d\n", argc - optind, + mode); + #endif +- usage(); ++ usage(rootdir); + } + + #ifdef DEBUG +@@ -351,21 +354,25 @@ main(int argc, char *argv[]) + switch (mode) + { + case MODE_EXTRACT: +- return extract(argv[optind], rootdir); ++ return_code = extract(argv[optind], rootdir); ++ break; + case MODE_CREATE: + tarfile = argv[optind]; + l = libtar_list_new(LIST_QUEUE, NULL); + for (c = optind + 1; c < argc; c++) + libtar_list_add(l, argv[c]); +- return create(tarfile, rootdir, l); ++ return_code = create(tarfile, rootdir, l); ++ libtar_list_free(l, NULL); ++ break; + case MODE_LIST: +- return list(argv[optind]); ++ return_code = list(argv[optind]); ++ break; + default: + break; + } + +- /* NOTREACHED */ +- return -2; ++ free(rootdir); ++ return return_code; + } + + diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch @@ -0,0 +1,89 @@ +From edbee9832475347183a841a8fd5be71f74e10392 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Wed, 23 Oct 2013 15:04:22 +0200 +Subject: [PATCH] decode: avoid using a static buffer in th_get_pathname() + +A solution suggested by Chris Frey: +https://lists.feep.net:8080/pipermail/libtar/2013-October/000377.html + +Note this can break programs that expect sizeof(TAR) to be fixed. + +Authored by Kamil Dudka <kdudka@redhat.com>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/ec613af2e9371d7a3e1f7c7a6822164a4255b4d1] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/decode.c | 24 +++++++++++++++++------- + lib/handle.c | 1 + + lib/libtar.h | 3 +++ + 3 files changed, 21 insertions(+), 7 deletions(-) + +diff --git a/lib/decode.c b/lib/decode.c +index c16ea2d..edb2185 100644 +--- a/lib/decode.c ++++ b/lib/decode.c +@@ -26,20 +26,30 @@ + char * + th_get_pathname(TAR *t) + { +- static TLS_THREAD char filename[MAXPATHLEN]; +- + if (t->th_buf.gnu_longname) + return t->th_buf.gnu_longname; + +- if (t->th_buf.prefix[0] != '\0') ++ /* allocate the th_pathname buffer if not already */ ++ if (t->th_pathname == NULL) ++ { ++ t->th_pathname = malloc(MAXPATHLEN * sizeof(char)); ++ if (t->th_pathname == NULL) ++ /* out of memory */ ++ return NULL; ++ } ++ ++ if (t->th_buf.prefix[0] == '\0') ++ { ++ snprintf(t->th_pathname, MAXPATHLEN, "%.100s", t->th_buf.name); ++ } ++ else + { +- snprintf(filename, sizeof(filename), "%.155s/%.100s", ++ snprintf(t->th_pathname, MAXPATHLEN, "%.155s/%.100s", + t->th_buf.prefix, t->th_buf.name); +- return filename; + } + +- snprintf(filename, sizeof(filename), "%.100s", t->th_buf.name); +- return filename; ++ /* will be deallocated in tar_close() */ ++ return t->th_pathname; + } + + +diff --git a/lib/handle.c b/lib/handle.c +index 002d23c..a19c046 100644 +--- a/lib/handle.c ++++ b/lib/handle.c +@@ -122,6 +122,7 @@ tar_close(TAR *t) + libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY + ? free + : (libtar_freefunc_t)tar_dev_free)); ++ free(t->th_pathname); + free(t); + + return i; +diff --git a/lib/libtar.h b/lib/libtar.h +index 7fc4d03..08a8e0f 100644 +--- a/lib/libtar.h ++++ b/lib/libtar.h +@@ -85,6 +85,9 @@ typedef struct + int options; + struct tar_header th_buf; + libtar_hash_t *h; ++ ++ /* introduced in libtar 1.2.21 */ ++ char *th_pathname; + } + TAR; + diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0009-Check-for-NULL-before-freeing-th_pathname.patch @@ -0,0 +1,30 @@ +From bc8ec7d940d7ffc870638521bd134098d2efa5df Mon Sep 17 00:00:00 2001 +From: Chris Frey <cdfrey@foursquare.net> +Date: Thu, 24 Oct 2013 17:55:12 -0400 +Subject: [PATCH] Check for NULL before freeing th_pathname + +Thanks to Harald Koch for pointing out that AIX 4 and 5 still need this. + +Authored by Chris Frey <cdfrey@foursquare.net>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/495d0c0eabc5648186e7d58ad54b508d14af38f4] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/handle.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/handle.c b/lib/handle.c +index a19c046..28a7dc2 100644 +--- a/lib/handle.c ++++ b/lib/handle.c +@@ -122,7 +122,8 @@ tar_close(TAR *t) + libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY + ? free + : (libtar_freefunc_t)tar_dev_free)); +- free(t->th_pathname); ++ if (t->th_pathname != NULL) ++ free(t->th_pathname); + free(t); + + return i; diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch @@ -0,0 +1,26 @@ +From c64dfdc6ec5bc752aafd1ac16a380f47602197c4 Mon Sep 17 00:00:00 2001 +From: Chris Frey <cdfrey@foursquare.net> +Date: Thu, 24 Oct 2013 17:58:47 -0400 +Subject: [PATCH] Added stdlib.h for malloc() in lib/decode.c + +Authored by Chris Frey <cdfrey@foursquare.net>. + +Upstream-Status: Backport [https://repo.or.cz/libtar.git/commit/20aa09bd7775094a2beb0f136c2c7d9e9fd6c7e6] + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/decode.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/lib/decode.c b/lib/decode.c +index edb2185..35312be 100644 +--- a/lib/decode.c ++++ b/lib/decode.c +@@ -13,6 +13,7 @@ + #include <internal.h> + + #include <stdio.h> ++#include <stdlib.h> + #include <sys/param.h> + #include <pwd.h> + #include <grp.h> diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/0011-libtar-fix-programming-mistakes-detected-by-static-a.patch @@ -0,0 +1,100 @@ +From b469d621c0143e652c51bb238fd2060135aa2009 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Tue, 6 Nov 2018 17:24:05 +0100 +Subject: [PATCH] libtar: fix programming mistakes detected by static analysis + +Authored by Kamil Dudka <kdudka@redhat.com>. + +meta-openembedded uses Debian's release tarball [1]. Debian uses +repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has +been inactive since 2013 [3]. + +Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013] + +[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8 +[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged) +[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/append.c | 7 +++++++ + lib/wrapper.c | 11 +++++++---- + libtar/libtar.c | 1 + + 3 files changed, 15 insertions(+), 4 deletions(-) + +diff --git a/lib/append.c b/lib/append.c +index ff58532..6386a50 100644 +--- a/lib/append.c ++++ b/lib/append.c +@@ -110,9 +110,16 @@ tar_append_file(TAR *t, const char *realname, const char *savename) + td->td_dev = s.st_dev; + td->td_h = libtar_hash_new(256, (libtar_hashfunc_t)ino_hash); + if (td->td_h == NULL) ++ { ++ free(td); + return -1; ++ } + if (libtar_hash_add(t->h, td) == -1) ++ { ++ libtar_hash_free(td->td_h, free); ++ free(td); + return -1; ++ } + } + libtar_hashptr_reset(&hp); + if (libtar_hash_getkey(td->td_h, &hp, &(s.st_ino), +diff --git a/lib/wrapper.c b/lib/wrapper.c +index 44cc435..2d3f5b9 100644 +--- a/lib/wrapper.c ++++ b/lib/wrapper.c +@@ -97,6 +97,7 @@ tar_append_tree(TAR *t, char *realdir, char *savedir) + struct dirent *dent; + DIR *dp; + struct stat s; ++ int ret = -1; + + #ifdef DEBUG + printf("==> tar_append_tree(0x%lx, \"%s\", \"%s\")\n", +@@ -130,24 +131,26 @@ tar_append_tree(TAR *t, char *realdir, char *savedir) + dent->d_name); + + if (lstat(realpath, &s) != 0) +- return -1; ++ goto fail; + + if (S_ISDIR(s.st_mode)) + { + if (tar_append_tree(t, realpath, + (savedir ? savepath : NULL)) != 0) +- return -1; ++ goto fail; + continue; + } + + if (tar_append_file(t, realpath, + (savedir ? savepath : NULL)) != 0) +- return -1; ++ goto fail; + } + ++ ret = 0; ++fail: + closedir(dp); + +- return 0; ++ return ret; + } + + +diff --git a/libtar/libtar.c b/libtar/libtar.c +index 23f8741..ac339e7 100644 +--- a/libtar/libtar.c ++++ b/libtar/libtar.c +@@ -92,6 +92,7 @@ gzopen_frontend(char *pathname, int oflags, int mode) + if (!gzf) + { + errno = ENOMEM; ++ close(fd); + return -1; + } + diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch b/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch new file mode 100644 index 0000000000..93b35cbcd3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2013-4420.patch @@ -0,0 +1,160 @@ +From 2c81f47508fa6bce9df84e3b43dfb16dffb742a0 Mon Sep 17 00:00:00 2001 +From: Raphael Geissert <geissert@debian.org> +Date: Thu, 12 Sep 2024 15:51:05 +0300 +Subject: [PATCH] Avoid directory traversal when extracting archives + +Description of the vulnerability from the NIST CVE tracker [1]: + + Multiple directory traversal vulnerabilities in the (1) + tar_extract_glob and (2) tar_extract_all functions in libtar 1.2.20 + and earlier allow remote attackers to overwrite arbitrary files via + a .. (dot dot) in a crafted tar file. + +Imported from the Debian libtar package 1.2.20-8 [2]. Original Debian +description: + + Author: Raphael Geissert <geissert@debian.org> + Bug-Debian: https://bugs.debian.org/731860 + Description: Avoid directory traversal when extracting archives + by skipping over leading slashes and any prefix containing ".." components. + Forwarded: yes + +meta-openembedded uses Debian's release tarball [3]. Debian uses +repo.or.cz/libtar.git as their upstream [4]. repo.or.cz/libtar.git has +been inactive since 2013 [5]. + +CVE: CVE-2013-4420 + +Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013] + +Comments: Added the commit message + +[1] https://nvd.nist.gov/vuln/detail/CVE-2013-4420 +[2] https://sources.debian.org/patches/libtar/1.2.20-8/CVE-2013-4420.patch/ +[3] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8 +[4] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged) +[5] https://repo.or.cz/libtar.git/shortlog/refs/heads/master + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/decode.c | 33 +++++++++++++++++++++++++++++++-- + lib/extract.c | 8 ++++---- + lib/internal.h | 1 + + lib/output.c | 4 ++-- + 4 files changed, 38 insertions(+), 8 deletions(-) + +diff --git a/lib/decode.c b/lib/decode.c +index 35312be..edd5f2e 100644 +--- a/lib/decode.c ++++ b/lib/decode.c +@@ -22,13 +22,42 @@ + # include <string.h> + #endif + ++char * ++safer_name_suffix (char const *file_name) ++{ ++ char const *p, *t; ++ p = t = file_name; ++ while (*p == '/') t = ++p; ++ while (*p) ++ { ++ while (p[0] == '.' && p[0] == p[1] && p[2] == '/') ++ { ++ p += 3; ++ t = p; ++ } ++ /* advance pointer past the next slash */ ++ while (*p && (p++)[0] != '/'); ++ } ++ ++ if (!*t) ++ { ++ t = "."; ++ } ++ ++ if (t != file_name) ++ { ++ /* TODO: warn somehow that the path was modified */ ++ } ++ return (char*)t; ++} ++ + + /* determine full path name */ + char * + th_get_pathname(TAR *t) + { + if (t->th_buf.gnu_longname) +- return t->th_buf.gnu_longname; ++ return safer_name_suffix(t->th_buf.gnu_longname); + + /* allocate the th_pathname buffer if not already */ + if (t->th_pathname == NULL) +@@ -50,7 +79,7 @@ th_get_pathname(TAR *t) + } + + /* will be deallocated in tar_close() */ +- return t->th_pathname; ++ return safer_name_suffix(t->th_pathname); + } + + +diff --git a/lib/extract.c b/lib/extract.c +index 9fc6ad5..4ff1a95 100644 +--- a/lib/extract.c ++++ b/lib/extract.c +@@ -302,14 +302,14 @@ tar_extract_hardlink(TAR * t, char *realname) + if (mkdirhier(dirname(filename)) == -1) + return -1; + libtar_hashptr_reset(&hp); +- if (libtar_hash_getkey(t->h, &hp, th_get_linkname(t), ++ if (libtar_hash_getkey(t->h, &hp, safer_name_suffix(th_get_linkname(t)), + (libtar_matchfunc_t)libtar_str_match) != 0) + { + lnp = (char *)libtar_hashptr_data(&hp); + linktgt = &lnp[strlen(lnp) + 1]; + } + else +- linktgt = th_get_linkname(t); ++ linktgt = safer_name_suffix(th_get_linkname(t)); + + #ifdef DEBUG + printf(" ==> extracting: %s (link to %s)\n", filename, linktgt); +@@ -347,9 +347,9 @@ tar_extract_symlink(TAR *t, char *realname) + + #ifdef DEBUG + printf(" ==> extracting: %s (symlink to %s)\n", +- filename, th_get_linkname(t)); ++ filename, safer_name_suffix(th_get_linkname(t))); + #endif +- if (symlink(th_get_linkname(t), filename) == -1) ++ if (symlink(safer_name_suffix(th_get_linkname(t)), filename) == -1) + { + #ifdef DEBUG + perror("symlink()"); +diff --git a/lib/internal.h b/lib/internal.h +index da7be7f..f05ca4f 100644 +--- a/lib/internal.h ++++ b/lib/internal.h +@@ -21,3 +21,4 @@ + #define TLS_THREAD + #endif + ++char* safer_name_suffix(char const*); +diff --git a/lib/output.c b/lib/output.c +index a5262ee..af754f1 100644 +--- a/lib/output.c ++++ b/lib/output.c +@@ -124,9 +124,9 @@ th_print_long_ls(TAR *t) + else + printf(" link to "); + if ((t->options & TAR_GNU) && t->th_buf.gnu_longlink != NULL) +- printf("%s", t->th_buf.gnu_longlink); ++ printf("%s", safer_name_suffix(t->th_buf.gnu_longlink)); + else +- printf("%.100s", t->th_buf.linkname); ++ printf("%.100s", safer_name_suffix(t->th_buf.linkname)); + } + + putchar('\n'); diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/libtar/files/CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch @@ -0,0 +1,42 @@ +From e590423f62cf5bc922ff4a1f7eab9bf7d65ee472 Mon Sep 17 00:00:00 2001 +From: Kamil Dudka <kdudka@redhat.com> +Date: Tue, 4 Oct 2022 10:39:35 +0200 +Subject: [PATCH] free memory allocated by gnu_long* fields + +Authored by Kamil Dudka <kdudka@redhat.com>. + +meta-openembedded uses Debian's release tarball [1]. Debian uses +repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has +been inactive since 2013 [3]. + +CVE: CVE-2021-33640 CVE-2021-33645 CVE-2021-33646 + +Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013] + +[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8 +[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged) +[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/handle.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/lib/handle.c b/lib/handle.c +index 28a7dc2..18bd8dc 100644 +--- a/lib/handle.c ++++ b/lib/handle.c +@@ -122,8 +122,11 @@ tar_close(TAR *t) + libtar_hash_free(t->h, ((t->oflags & O_ACCMODE) == O_RDONLY + ? free + : (libtar_freefunc_t)tar_dev_free)); +- if (t->th_pathname != NULL) +- free(t->th_pathname); ++ ++ free(t->th_pathname); ++ free(t->th_buf.gnu_longname); ++ free(t->th_buf.gnu_longlink); ++ + free(t); + + return i; diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch b/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch new file mode 100644 index 0000000000..a61cc3b6a9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libtar/files/CVE-2021-33643-CVE-2021-33644.patch @@ -0,0 +1,52 @@ +From c778d234c396e78bacef7c9bff0dd2bb9fb6aac8 Mon Sep 17 00:00:00 2001 +From: shixuantong <1726671442@qq.com> +Date: Wed, 6 Apr 2022 17:40:57 +0800 +Subject: [PATCH] Ensure that sz is greater than 0. + +Authored by shixuantong <1726671442@qq.com>. + +meta-openembedded uses Debian's release tarball [1]. Debian uses +repo.or.cz/libtar.git as their upstream [2]. repo.or.cz/libtar.git has +been inactive since 2013 [3]. + +CVE: CVE-2021-33643 CVE-2021-33644 + +Upstream-Status: Inactive-Upstream [lastrelease: 2013 lastcommit: 2013] + +[1] https://git.openembedded.org/meta-openembedded/tree/meta-oe/recipes-support/libtar/libtar_1.2.20.bb?h=master#n8 +[2] http://svn.kibibyte.se/libtar/trunk/debian/control (rev 51; not tagged) +[3] https://repo.or.cz/libtar.git/shortlog/refs/heads/master + +Signed-off-by: Katariina Lounento <katariina.lounento@vaisala.com> +--- + lib/block.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/lib/block.c b/lib/block.c +index 092bc28..f12c4bc 100644 +--- a/lib/block.c ++++ b/lib/block.c +@@ -118,6 +118,11 @@ th_read(TAR *t) + if (TH_ISLONGLINK(t)) + { + sz = th_get_size(t); ++ if ((int)sz <= 0) ++ { ++ errno = EINVAL; ++ return -1; ++ } + blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0); + if (blocks > ((size_t)-1 / T_BLOCKSIZE)) + { +@@ -168,6 +173,11 @@ th_read(TAR *t) + if (TH_ISLONGNAME(t)) + { + sz = th_get_size(t); ++ if ((int)sz <= 0) ++ { ++ errno = EINVAL; ++ return -1; ++ } + blocks = (sz / T_BLOCKSIZE) + (sz % T_BLOCKSIZE ? 1 : 0); + if (blocks > ((size_t)-1 / T_BLOCKSIZE)) + { diff --git a/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb b/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb index f93d9c09a5..c7501ac684 100644 --- a/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/libtar/libtar_1.2.20.bb @@ -8,6 +8,18 @@ LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=61cbac6719ae682ce6cd45b5c11e21af" SRC_URI = "${DEBIAN_MIRROR}/main/libt/${BPN}/${BPN}_${PV}.orig.tar.gz \ file://fix_libtool_sysroot.patch \ file://0002-Do-not-strip-libtar.patch \ + file://0003-Fix-missing-prototype-compiler-warnings.patch \ + file://0004-Fix-invalid-memory-de-reference-issue.patch \ + file://0005-fix-file-descriptor-leaks-reported-by-cppcheck.patch \ + file://0006-fix-memleak-on-tar_open-failure.patch \ + file://0007-fix-memleaks-in-libtar-sample-program.patch \ + file://0008-decode-avoid-using-a-static-buffer-in-th_get_pathnam.patch \ + file://0009-Check-for-NULL-before-freeing-th_pathname.patch \ + file://0010-Added-stdlib.h-for-malloc-in-lib-decode.c.patch \ + file://0011-libtar-fix-programming-mistakes-detected-by-static-a.patch \ + file://CVE-2021-33643-CVE-2021-33644.patch \ + file://CVE-2021-33640-CVE-2021-33645-CVE-2021-33646.patch \ + file://CVE-2013-4420.patch \ " S = "${WORKDIR}/${BPN}" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch new file mode 100644 index 0000000000..90f028b856 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch @@ -0,0 +1,43 @@ +From 7ea4e55a91e6d5564c6de762c2d1afc78ff9cfd3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 16 Sep 2024 22:58:38 +0000 +Subject: [PATCH] test: Compile nolibc.c only when CONFIG_NOLIBC is set + +building nolibc.c fails for non nolibc targets + +Fixes +In file included from nolibc.c:33: +./../src/lib.h:20:2: error: "This arch doesn't support building liburing without libc" + 20 | #error "This arch doesn't support building liburing without libc" + | ^ +1 error generated. + +Upstream-Status: Backport [https://github.com/axboe/liburing/commit/a182f62c01f981cd9dd508ec952fbc975b263e3d] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/Makefile | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/test/Makefile b/test/Makefile +index 0538a75..0dfecb8 100644 +--- a/test/Makefile ++++ b/test/Makefile +@@ -126,7 +126,6 @@ test_srcs := \ + msg-ring-overflow.c \ + multicqes_drain.c \ + no-mmap-inval.c \ +- nolibc.c \ + nop-all-sizes.c \ + nop.c \ + ooo-file-unreg.c \ +@@ -221,6 +220,10 @@ test_srcs := \ + all_targets := + include ../Makefile.quiet + ++ifeq ($(CONFIG_NOLIBC),y) ++ test_srcs += nolibc.c ++endif ++ + ifdef CONFIG_HAVE_STATX + test_srcs += statx.c + else ifdef CONFIG_HAVE_GLIBC_STATX diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch new file mode 100644 index 0000000000..62ca78a1ed --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0001-test-Drop-including-error.h-header.patch @@ -0,0 +1,27 @@ +From 684bcb2a8795fd399d6c164e51459a2785057b1c Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 09:56:42 -0700 +Subject: [PATCH 1/2] test: Drop including error.h header + +There is no error APIs being used in this test, therefore +drop including it, this also makes it portable to musl +systems which do not have error.h + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/init-mem.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/test/init-mem.c b/test/init-mem.c +index 6f9a02a..f512190 100644 +--- a/test/init-mem.c ++++ b/test/init-mem.c +@@ -13,7 +13,6 @@ + #include <netinet/udp.h> + #include <arpa/inet.h> + #include <net/if.h> +-#include <error.h> + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch new file mode 100644 index 0000000000..8a1d542502 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing/0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch @@ -0,0 +1,32 @@ +From d06433ff1a1905436cfcde80e22ee51bd9591536 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 09:59:31 -0700 +Subject: [PATCH 2/2] ooo-file-unreg.c: Include poll.h instead of sys/poll.h + +This fixes a warning e.g. + +In file included from ooo-file-unreg.c:12: +/mnt/b/yoe/master/build/tmp/work/riscv32-yoe-linux-musl/liburing/2.7/recipe-sysroot/usr/include/sys/poll.h:1:2: warning: redirecting incorrect #include <sys/poll.h> to <poll.h> [-W#warnings] + 1 | #warning redirecting incorrect #include <sys/poll.h> to <poll.h> + | ^ +1 warning generated. + +Upstream-Status: Submitted [https://github.com/axboe/liburing/pull/1233] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/ooo-file-unreg.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/ooo-file-unreg.c b/test/ooo-file-unreg.c +index d76e0fb..dd6ea55 100644 +--- a/test/ooo-file-unreg.c ++++ b/test/ooo-file-unreg.c +@@ -9,7 +9,7 @@ + #include <sys/socket.h> + #include <unistd.h> + #include <stdlib.h> +-#include <sys/poll.h> ++#include <poll.h> + + #include "liburing.h" + #include "helpers.h" diff --git a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.6.bb b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.7.bb index fc3fe1cac1..b10fe40ca0 100644 --- a/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.6.bb +++ b/meta-openembedded/meta-oe/recipes-support/liburing/liburing_2.7.bb @@ -9,8 +9,11 @@ SECTION = "libs" LICENSE = "LGPL-2.1-only | MIT" LIC_FILES_CHKSUM = "file://README;beginline=41;endline=44;md5=2b0e9926530c269f5ae95560370195af" -SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https" -SRCREV = "f7dcc1ea60819475dffd3a45059e16f04381bee7" +SRC_URI = "git://github.com/axboe/liburing.git;branch=master;protocol=https \ + file://0001-test-Compile-nolibc.c-only-when-CONFIG_NOLIBC-is-set.patch \ + file://0001-test-Drop-including-error.h-header.patch \ + file://0002-ooo-file-unreg.c-Include-poll.h-instead-of-sys-poll..patch" +SRCREV = "5227d48b28ad8671e61d444b72678da584d2e6c3" S = "${WORKDIR}/git" @@ -19,10 +22,11 @@ XCFLAGS = "-pthread" XCFLAGS:append:libc-musl = " -lucontext" USELIBC = "" -# clang-18 on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro +# clang-18+ on RV64 emits memset for arch/riscv64/syscall.h provided __do_syscall4 macro # this does not happen for gcc or older clang, so link with libc since we need memset API # -fno-builtin-memset does not help USELIBC:riscv64:toolchain-clang = "--use-libc" +USELIBC:riscv32 = "--use-libc" EXTRA_OEMAKE = "'CC=${CC}' 'RANLIB=${RANLIB}' 'AR=${AR}' 'CFLAGS=${CFLAGS} -I${S}/include -DWITHOUT_XATTR' 'LDFLAGS=${LDFLAGS}' 'XCFLAGS=${XCFLAGS}' 'BUILDDIR=${S}'" do_configure() { ${S}/configure --prefix=${prefix} --libdir=${libdir} --libdevdir=${libdir} --mandir=${mandir} --datadir=${datadir} --includedir=${includedir} ${USELIBC} diff --git a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx-config.bb b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx-config.bb index 4e9e6bcdfd..c79dd092cd 100644 --- a/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx-config.bb +++ b/meta-openembedded/meta-oe/recipes-support/libusbgx/libusbgx-config.bb @@ -4,6 +4,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 SRC_URI = "file://usbgx.default" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + do_configure[noexec] = "1" do_compile[noexec] = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/links/links_2.29.bb b/meta-openembedded/meta-oe/recipes-support/links/links_2.29.bb index e3a15d1819..311d84e484 100644 --- a/meta-openembedded/meta-oe/recipes-support/links/links_2.29.bb +++ b/meta-openembedded/meta-oe/recipes-support/links/links_2.29.bb @@ -9,3 +9,5 @@ EXTRA_OECONF = "--enable-graphics \ --without-directfb --without-pmshell --without-atheos \ --without-x" SRC_URI[sha256sum] = "22aa96c0b38e1a6f8f7ed9d7a4167a47fc37246097759ef6059ecf8f9ead7998" + +CVE_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-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb index 729857eb62..a8b9b9a019 100644 --- a/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/log4cpp/log4cpp_1.1.4.bb @@ -20,3 +20,7 @@ EXTRA_OECONF = "\ " CXXFLAGS += "-std=c++14" + +do_install:append() { + sed -i -e 's|${DEBUG_PREFIX_MAP}||g; s|--sysroot=${STAGING_DIR_TARGET}||g' ${D}${bindir}/log4cpp-config +} diff --git a/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb b/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb index 3549cb2153..6be82979a4 100644 --- a/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.14.bb +++ b/meta-openembedded/meta-oe/recipes-support/logwarn/logwarn_1.0.17.bb @@ -11,8 +11,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "https://s3.amazonaws.com/archie-public/${BPN}/${BP}.tar.gz" -SRC_URI[md5sum] = "e544a6230673ea54f7430bf817bb39d8" -SRC_URI[sha256sum] = "8dbfcf9b28c782ab3bddd6a620d4fb95d1b0ffcbe93276996cdc4800aa9aebd1" +SRC_URI[sha256sum] = "062d197349f4a43d8f69887fc642cb58b59a8e2cc54cc951d5c1c6abc4809a9a" + +UPSTREAM_CHECK_URI = "https://github.com/archiecobbs/logwarn/tags" +UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+(\.\d+)+)" inherit autotools-brokensep diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch deleted file mode 100644 index f4b0f913d8..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-configure.ac-check-egrep.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f261b2f1bc16c32a55a22e28bf1b2f15ac6c7a88 Mon Sep 17 00:00:00 2001 -From: Kai Kang <kai.kang@windriver.com> -Date: Wed, 6 Dec 2023 10:24:46 +0800 -Subject: [PATCH] configure.ac: check egrep - -The macro AC_HEADER_STDC which requires AC_PROG_EGREP has been removed -from configure.ac, then it fails to substitute '@EGREP@': - -| [GEN] command-lines-input.h -| /bin/bash: line 2: @EGREP@: command not found -| [GEN] command-count.h - -Call AC_PROG_EGREP to fix the error. - -Upstream-Status: Submitted [https://gitlab.com/lvmteam/lvm2/-/merge_requests/4] - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index c2dbf3c9f..d9e7964c3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,6 +88,7 @@ AC_PROG_EGREP - AC_PROG_MAKE_SET - AC_PROG_MKDIR_P - AC_PROG_RANLIB -+AC_PROG_EGREP - AC_CHECK_TOOL([READELF], [readelf]) - AC_CHECK_TOOL(AR, ar) - AC_PATH_TOOL(CFLOW_CMD, cflow) diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch index e11ac5ac08..196de644cc 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-implement-libc-specific-reopen_stream.patch @@ -1,4 +1,4 @@ -From a86919ed5468f3c152114446c189b00f5f656d59 Mon Sep 17 00:00:00 2001 +From e2f24ea066e6dfb9f13f623009034acbf4ae8818 Mon Sep 17 00:00:00 2001 From: Dengke Du <dengke.du@windriver.com> Date: Tue, 25 Oct 2016 11:49:40 +0000 Subject: [PATCH] implement libc specific reopen_stream @@ -21,7 +21,7 @@ Upstream-Status: Pending 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/log/log.c b/lib/log/log.c -index 7b88252f0..e1720098a 100644 +index eafb3ef1c..ff3d751bf 100644 --- a/lib/log/log.c +++ b/lib/log/log.c @@ -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 void init_log_fn(lvm2_log_fn_t log_fn) { diff --git a/tools/lvmcmdline.c b/tools/lvmcmdline.c -index 3fd23a521..c2ee39905 100644 +index 1b2f7f47c..e0674d42d 100644 --- a/tools/lvmcmdline.c +++ b/tools/lvmcmdline.c -@@ -3380,7 +3380,7 @@ static int _check_standard_fds(void) +@@ -3378,7 +3378,7 @@ static int _check_standard_fds(void) int err = is_valid_fd(STDERR_FILENO); if (!is_valid_fd(STDIN_FILENO) && @@ -57,7 +57,7 @@ index 3fd23a521..c2ee39905 100644 if (err) perror("stdin stream open"); else -@@ -3390,7 +3390,7 @@ static int _check_standard_fds(void) +@@ -3388,7 +3388,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDOUT_FILENO) && @@ -66,7 +66,7 @@ index 3fd23a521..c2ee39905 100644 if (err) perror("stdout stream open"); /* else no stdout */ -@@ -3398,7 +3398,7 @@ static int _check_standard_fds(void) +@@ -3396,7 +3396,7 @@ static int _check_standard_fds(void) } if (!is_valid_fd(STDERR_FILENO) && diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch index 83a7f936b1..c57bff865a 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/files/0001-include-libgen.h-for-basename.patch @@ -1,4 +1,4 @@ -From 4e7f4ea0bf89726255612a2a382c064e5923fbcd Mon Sep 17 00:00:00 2001 +From 4e2dc175e99792d84873a4785ff1524845267c3e Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 25 Mar 2024 13:07:28 -0700 Subject: [PATCH] include libgen.h for basename @@ -16,12 +16,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> 1 file changed, 1 insertion(+) diff --git a/lib/device/device_id.c b/lib/device/device_id.c -index 2b183810a..53467cbbb 100644 +index b3330f2ba..291bd5c73 100644 --- a/lib/device/device_id.c +++ b/lib/device/device_id.c -@@ -26,6 +26,7 @@ - #include "lib/datastruct/str_list.h" - #include "lib/metadata/metadata-exported.h" +@@ -28,6 +28,7 @@ + #include "lib/activate/activate.h" + #include "device_mapper/misc/dm-ioctl.h" +#include <libgen.h> #include <sys/stat.h> diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper.bb index be558ce1d2..3b4439c3ae 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/libdevmapper.bb @@ -5,6 +5,8 @@ require lvm2.inc DEPENDS += "autoconf-archive-native" +inherit nopackages + TARGET_CC_ARCH += "${LDFLAGS}" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.bb b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.bb index 868f5a249e..f905a5ac9e 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.bb +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.bb @@ -57,21 +57,30 @@ LVM2_PACKAGECONFIG:append:class-target = " \ " PACKAGECONFIG[dbus] = "--enable-dbus-service,--disable-dbus-service,,python3-dbus python3-pyudev" -PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev,${PN}-udevrules" +PACKAGECONFIG[udev] = "--enable-udev_sync --enable-udev_rules --with-udevdir=${nonarch_base_libdir}/udev/rules.d,--disable-udev_sync --disable-udev_rules,udev," PACKAGES =+ "libdevmapper" FILES:libdevmapper = " \ ${libdir}/libdevmapper.so.* \ ${sbindir}/dmsetup \ ${sbindir}/dmstats \ + ${nonarch_base_libdir}/udev/rules.d/10-dm.rules \ + ${nonarch_base_libdir}/udev/rules.d/13-dm-disk.rules \ + ${nonarch_base_libdir}/udev/rules.d/95-dm-notify.rules \ " FILES:${PN} += " \ ${libdir}/device-mapper/*.so \ - ${systemd_system_unitdir}/lvm2-pvscan@.service \ + ${systemd_system_unitdir} \ ${PYTHON_SITEPACKAGES_DIR}/lvmdbusd \ ${datadir}/dbus-1/system-services/com.redhat.lvmdbus1.service \ + ${nonarch_base_libdir}/udev/rules.d/11-dm-lvm.rules \ + ${nonarch_base_libdir}/udev/rules.d/69-dm-lvm.rules \ " +# Remove /lib/udev from FILES:${PN} so that any new rules files that are added +# upstream will have to be explicitly added to either FILES:${PN} or +# FILES:libdevmapper. +FILES:${PN}:remove = "${nonarch_base_libdir}/udev" FILES:${PN}-scripts = " \ ${sbindir}/blkdeactivate \ @@ -79,11 +88,8 @@ FILES:${PN}-scripts = " \ ${sbindir}/lvmconf \ ${sbindir}/lvmdump \ " -# Specified explicitly for the udev rules, just in case that it does not get picked -# up automatically: -FILES:${PN}-udevrules = "${nonarch_base_libdir}/udev/rules.d" + RDEPENDS:${PN} = "bash" -RDEPENDS:${PN}-udevrules = "libdevmapper" RDEPENDS:${PN}:append:class-target = " libdevmapper" RDEPENDS:${PN}:append:class-nativesdk = " libdevmapper" diff --git a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc index 29cc7425ba..059ab6999b 100644 --- a/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc +++ b/meta-openembedded/meta-oe/recipes-support/lvm2/lvm2.inc @@ -15,13 +15,12 @@ SRC_URI = "git://sourceware.org/git/lvm2.git;branch=main \ file://0005-do-not-build-manual.patch \ file://0006-start-lvm2-monitor.service-after-tmp.mount.patch \ file://reproducible-build.patch \ - file://0001-configure.ac-check-egrep.patch \ file://0001-include-libgen.h-for-basename.patch \ " -SRCREV = "90ec2cd92f6367c431dd8dae55d0cbe7e196734f" +SRCREV = "6de3937ac517a3ecfd6d8d90f3f055dab631157e" S = "${WORKDIR}/git" -PV = "2.03.24" +PV = "2.03.26" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\_\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb b/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb index ccc21f418c..d0e7e39202 100644 --- a/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb +++ b/meta-openembedded/meta-oe/recipes-support/mbuffer/mbuffer_20140310.bb @@ -8,6 +8,8 @@ SRC_URI = " \ http://www.maier-komor.de/software/mbuffer/mbuffer-20140310.tgz \ " +UPSTREAM_CHECK_URI = "http://www.maier-komor.de/mbuffer.html" + SRC_URI[md5sum] = "9937d7f666c19a2e6b2499b04dbecc44" SRC_URI[sha256sum] = "ab90b6fdce16db2bf08bcda0bc5d2bfb053a9a163d2a24f95fbf246460549b99" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb index a228c3cc06..08ec8c574e 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-inject_git.bb @@ -6,7 +6,7 @@ SECTION = "System Environment/Base" SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-inject.git;branch=master" -SRCREV = "4cbe46321b4a81365ff3aafafe63967264dbfec5" +SRCREV = "7668d820cadce2da9d90b72aab14c3e637ca47d6" UPSTREAM_CHECK_COMMITS = "1" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb index 05e98e86ed..0a6fd684eb 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mce-test_git.bb @@ -14,8 +14,8 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mce-test.git;protocol=git; file://makefile-remove-ldflags.patch \ file://0001-gcov_merge.py-scov_merge.py-switch-to-python3.patch \ " -SRCREV = "025014dedca39d2b8a57a82e52286e72e157d73a" -PV = "20222810+git" +SRCREV = "9d11fc3e05eae7b454efeb5941beded56f80445b" +PV = "20230601+git" RDEPENDS:${PN} = "mcelog mce-inject dialog bash" diff --git a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_199.bb b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_200.bb index 0a48fc48ce..9d72e78599 100644 --- a/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_199.bb +++ b/meta-openembedded/meta-oe/recipes-support/mcelog/mcelog_200.bb @@ -10,7 +10,7 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git;protocol=http;; file://run-ptest \ " -SRCREV = "c17897deb52daab300c585a6a6c2456d062d80cf" +SRCREV = "955fd0917ab1b9f159443e5cbba1d0fa73486fac" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" diff --git a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb index 371281d6e4..b503506a2b 100644 --- a/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/mscgen/mscgen_0.20.bb @@ -9,6 +9,8 @@ SRC_URI = "http://www.mcternan.me.uk/mscgen/software/${BPN}-src-${PV}.tar.gz" SRC_URI[md5sum] = "65c90fb5150d7176b65b793f0faa7377" SRC_URI[sha256sum] = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23" +UPSTREAM_CHECK_URI = "https://www.mcternan.me.uk//mscgen/" + DEPENDS = "gd " inherit autotools gettext pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb b/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb index b4f4651e37..4c68e7adf4 100644 --- a/meta-openembedded/meta-oe/recipes-support/msktutil/msktutil_1.2.1.bb +++ b/meta-openembedded/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 file://0001-configure.ac-Remove-native-include-path.patch" SRC_URI[sha256sum] = "f9686237c4e24414802415f4c8627c7343da365c5a3bcdef7a853fa3cd27b45d" +UPSTREAM_CHECK_URI = "https://github.com/msktutil/msktutil/releases/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + DEPENDS += "krb5 cyrus-sasl openldap" inherit autotools diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_8.0.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_8.2.bb index 56aa47f641..46e5a15c1c 100644 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_8.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_8.2.bb @@ -13,7 +13,7 @@ RDEPENDS:${PN} = "ncurses-terminfo-base" PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "c17f43fc0e37336b33ee50a209c701d5beb808adc2d9f089ca831b40539c9ac4" +SRC_URI[sha256sum] = "d5ad07dd862facae03051c54c6535e54c7ed7407318783fcad1ad2d7076fffeb" UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" diff --git a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb index 1779dd2273..495afd164f 100644 --- a/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb +++ b/meta-openembedded/meta-oe/recipes-support/nmon/nmon_16m.bb @@ -14,6 +14,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/nmon/lmon${PV}.c;name=lmon \ SRC_URI[lmon.sha256sum] = "2bed4d45fdfdf1d1387ec91e139c04975d5f838e3e0d53c0fe2d803a707e5fc1" SRC_URI[doc.sha256sum] = "1f7f83afe62a7210be5e83cd24157adb854c14599efe0b377a7ecca933869278" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/nmon/files/" +UPSTREAM_CHECK_REGEX = "lmon(?P<pver>.*).c" + CFLAGS += "-D JFS -D GETUSER -Wall -D LARGEMEM" LDFLAGS += "-ltinfo -lncursesw -lm" ASNEEDED:pn-nmon = "" diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.101.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.103.bb index 5a01efb7e4..64141e9383 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.101.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.103.bb @@ -33,10 +33,10 @@ SRC_URI = "http://ftp.mozilla.org/pub/security/nss/releases/${VERSION_DIR}/src/$ file://nss-fix-nsinstall-build.patch \ file://0001-freebl-add-a-configure-option-to-disable-ARM-HW-cryp.patch \ " -SRC_URI[sha256sum] = "859748f0b4b7bb51e7e600ae5a88ef4d71f93e6964b1beed2727784dd9ed85e7" +SRC_URI[sha256sum] = "7b4ab657f772dc7520c46e8d481940b292dcfc6a4c90150a7c26672384cee962" -UPSTREAM_CHECK_URI = "https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_Releases" -UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>.+)_release_notes" +UPSTREAM_CHECK_URI = "https://ftp.mozilla.org/pub/security/nss/releases/" +UPSTREAM_CHECK_REGEX = "NSS_(?P<pver>\d+(\_\d+)+)" inherit siteinfo diff --git a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb index b29437db1e..414d9bfc16 100644 --- a/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/onig/onig_6.9.9.bb @@ -16,6 +16,9 @@ SRC_URI = "\ SRC_URI[sha256sum] = "60162bd3b9fc6f4886d4c7a07925ffd374167732f55dce8c491bfd9cd818a6cf" +UPSTREAM_CHECK_URI = "https://github.com/kkos/oniguruma/releases/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + BINCONFIG = "${bindir}/onig-config" inherit autotools binconfig-disabled ptest diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/openct/openct/0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch @@ -0,0 +1,65 @@ +From c4351058da555e1e6a2b4b15d913baee80f55865 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Thu, 27 Jun 2024 06:27:18 +0000 +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +| ../../../openct-0.6.20/src/ifd/ifdhandler.c: In function 'ifdhandler_run': +| ../../../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] +| 239 | sock->fd = ifd_get_eventfd(reader, &sock->events); +| | ^~~~~~~~~~~~~ +| | | +| | int * +| In file included from ../../../openct-0.6.20/src/ifd/internal.h:17, +| from ../../../openct-0.6.20/src/ifd/ifdhandler.c:7: +| ../../../openct-0.6.20/src/include/openct/ifd.h:182:65: note: expected 'short int *' but argument is of type 'int *' +| 182 | extern int ifd_get_eventfd(ifd_reader_t *, short *); +| | ^~~~~~~ + +| ../../../openct-0.6.20/src/ifd/process.c: In function 'do_memory_write': +| ../../../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] +| 461 | || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) +| | ^~~~~~~~~ +| | | +| | unsigned int * +| In file included from ../../../openct-0.6.20/src/ifd/process.c:20: +| ../../../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 *' +| 40 | ifd_tag_t, unsigned char **, size_t *); + +Upstream-Status: Submitted + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + src/ifd/ifdhandler.c | 2 +- + src/ifd/process.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/ifd/ifdhandler.c b/src/ifd/ifdhandler.c +index 12686c9..ebd1b53 100644 +--- a/src/ifd/ifdhandler.c ++++ b/src/ifd/ifdhandler.c +@@ -236,7 +236,7 @@ static void ifdhandler_run(ifd_reader_t * reader) + sock->fd = -1; + } + else { +- sock->fd = ifd_get_eventfd(reader, &sock->events); ++ sock->fd = ifd_get_eventfd(reader, (short int *)&sock->events); + } + if (sock->fd == -1) { + ifd_debug(1, "events inactive for reader %s", reader->name); +diff --git a/src/ifd/process.c b/src/ifd/process.c +index 4563bdf..7088a76 100644 +--- a/src/ifd/process.c ++++ b/src/ifd/process.c +@@ -458,7 +458,7 @@ static int do_memory_write(ifd_reader_t * reader, int unit, + return IFD_ERROR_INVALID_SLOT; + + if (ct_tlv_get_int(args, CT_TAG_ADDRESS, &address) == 0 +- || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, &data_len)) ++ || !ct_tlv_get_opaque(args, CT_TAG_DATA, &data, (size_t *)&data_len)) + return IFD_ERROR_MISSING_ARG; + + rc = ifd_card_write_memory(reader, unit, address, data, data_len); +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb index e4b99089f5..bcff90c86e 100644 --- a/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/openct/openct_0.6.20.bb @@ -18,11 +18,14 @@ SRC_URI = " \ file://openct.init \ file://openct.sysconfig \ file://openct.service \ + file://0001-Fix-incompatible-pointer-type-error-with-gcc-option.patch \ " SRC_URI[md5sum] = "a1da3358ab798f1cb9232f1dbababc21" SRC_URI[sha256sum] = "6cd3e2933d29eb1f875c838ee58b8071fd61f0ec8ed5922a86c01c805d181a68" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/opensc/files/openct/" + LICENSE = "LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://LGPL-2.1;md5=2d5025d4aa3495befef8f17206a5b0a1" @@ -82,3 +85,8 @@ do_install () { } BBCLASSEXTEND = "native" + +# http://errors.yoctoproject.org/Errors/Details/766890/ +# 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] +# 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] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.9.0.bb b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.10.0.bb index cf836d3ecf..07bdb37b75 100644 --- a/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.9.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opencv/opencv_4.10.0.bb @@ -10,8 +10,8 @@ ARM_INSTRUCTION_SET:armv5 = "arm" DEPENDS = "libtool swig-native bzip2 zlib glib-2.0 libwebp" -SRCREV_opencv = "dad8af6b17f8e60d7b95a1203a1b4d22f56574cf" -SRCREV_contrib = "c7602a8f74205e44389bd6a4e8d727d32e7e27b4" +SRCREV_opencv = "a7d942b681c5edd0cc27407d8e4d3dbf36c7a40e" +SRCREV_contrib = "1aab1f34815a58a5a63aee6d510fe234129754a2" SRCREV_boostdesc = "34e4206aef44d50e6bbcd0ab06354b52e7466d26" SRCREV_vgg = "fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d" SRCREV_face = "8afa57abc8229d611c4937165d20e2a2d9fc5a12" @@ -86,7 +86,7 @@ EXTRA_OECMAKE:append:x86 = " -DX86=ON" EXTRA_OECMAKE:remove:x86 = " -DENABLE_SSE41=1 -DENABLE_SSE42=1" PACKAGECONFIG ??= "gapi python3 eigen jpeg png tiff v4l libv4l gstreamer samples tbb gphoto2 \ - ${@bb.utils.contains("DISTRO_FEATURES", "x11", "gtk", "", d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', '${GTK3DISTROFEATURES}', 'gtk', '', d)} \ ${@bb.utils.contains_any("LICENSE_FLAGS_ACCEPTED", "commercial_ffmpeg commercial", "libav", "", d)}" # TBB does not build for powerpc so disable that package config diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch new file mode 100644 index 0000000000..e6ab4e5a46 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap/0001-fix-incompatible-pointer-type-error.patch @@ -0,0 +1,40 @@ +From 634017950c1c920d0de63fffa5c52e621de1d603 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 26 Jun 2024 07:41:01 +0000 +Subject: Fix incompatible pointer type error with gcc option + -Wincompatible-pointer-types + +lib32-openldap do_compile failure with gcc-14: +| tls_g.c:971:57: error: passing argument 4 of 'gnutls_fingerprint' from incompatible pointer type [-Wincompatible-pointer-types] +| 971 | keyhash.bv_val, &keyhash.bv_len ) < 0 ) { +| | ^~~~~~~~~~~~~~~ +| | | +| | ber_len_t * {aka long unsigned int *} +| In file included from tls_g.c:44: +| /usr/include/gnutls/gnutls.h:2406:32: note: expected 'size_t *' {aka 'unsigned int *'} but argument is of type 'ber_len_t *' {aka 'long unsigned int *'} +| 2406 | size_t *result_size); +| | ^~~ + +Upstream-Status: Submitted + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + libraries/libldap/tls_g.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libraries/libldap/tls_g.c b/libraries/libldap/tls_g.c +index 7c23875..b4b487d 100644 +--- a/libraries/libldap/tls_g.c ++++ b/libraries/libldap/tls_g.c +@@ -968,7 +968,7 @@ tlsg_session_pinning( LDAP *ld, tls_session *sess, char *hashalg, struct berval + keyhash.bv_len = gnutls_hash_get_len( alg ); + keyhash.bv_val = LDAP_MALLOC( keyhash.bv_len ); + if ( !keyhash.bv_val || gnutls_fingerprint( alg, &key, +- keyhash.bv_val, &keyhash.bv_len ) < 0 ) { ++ keyhash.bv_val, (size_t *)&keyhash.bv_len ) < 0 ) { + goto done; + } + } else { +-- +2.34.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.6.7.bb b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.6.8.bb index e619b059b1..ca27ab23ec 100644 --- a/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.6.7.bb +++ b/meta-openembedded/meta-oe/recipes-support/openldap/openldap_2.6.8.bb @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.OpenLDAP.org/license.html" # basically BSD. opensource.org does not record this license # at present (so it is apparently not OSI certified). LICENSE = "OpenLDAP" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=beceb5ac7100b6430640c61655b25c1f \ +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3a41b4ed95ab4a20f366a8d82536afe4 \ file://LICENSE;md5=153d07ef052c4a37a8fac23bc6031972 \ " SECTION = "libs" @@ -19,9 +19,10 @@ SRC_URI = "http://www.openldap.org/software/download/OpenLDAP/openldap-release/$ file://slapd.service \ file://remove-user-host-pwd-from-version.patch \ file://0001-build-top.mk-unset-STRIP_OPTS.patch \ + file://0001-fix-incompatible-pointer-type-error.patch \ " -SRC_URI[sha256sum] = "cd775f625c944ed78a3da18a03b03b08eea73c8aabc97b41bb336e9a10954930" +SRC_URI[sha256sum] = "48969323e94e3be3b03c6a132942dcba7ef8d545f2ad35401709019f696c3c4e" DEPENDS = "util-linux groff-native" diff --git a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.25.1.bb b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.25.1.bb index 19fb78092e..636bfa0366 100644 --- a/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.25.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/opensc/opensc_0.25.1.bb @@ -5,24 +5,23 @@ functionality (e.g. SELECT FILE, READ BINARY) should work on any ISO\ keys on the smart card is possible with PKCS\ such as the FINEID (Finnish Electronic IDentity) card. Swedish Posten\ eID cards have also been confirmed to work." - HOMEPAGE = "https://github.com/OpenSC/OpenSC/wiki" SECTION = "System Environment/Libraries" -LICENSE = "LGPL-2.0-or-later" +LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=cb8aedd3bced19bd8026d96a8b6876d7" +DEPENDS = "openssl" -#v0.21.0 SRCREV = "0a4b772d6fdab9bfaaa3123775a48a7cb6c5e7c6" SRC_URI = "git://github.com/OpenSC/OpenSC;branch=stable-0.25;protocol=https" -DEPENDS = "virtual/libiconv openssl" S = "${WORKDIR}/git" + inherit autotools pkgconfig bash-completion EXTRA_OECONF = " \ - --disable-static \ --disable-ctapi \ --disable-doc \ + --disable-static \ --disable-strict \ " EXTRA_OEMAKE = "DESTDIR=${D}" @@ -31,12 +30,10 @@ PACKAGECONFIG ??= "pcsc" PACKAGECONFIG[openct] = "--enable-openct,--disable-openct,openct" PACKAGECONFIG[pcsc] = "--enable-pcsc,--disable-pcsc,pcsc-lite,pcsc-lite pcsc-lite-lib" - -RDEPENDS:${PN} = "readline" +PACKAGECONFIG[readline] = "--enable-readline,--disable-readline,readline" FILES:${PN} += "\ ${libdir}/opensc-pkcs11.so \ - ${libdir}/onepin-opensc-pkcs11.so \ ${libdir}/pkcs11-spy.so \ " FILES:${PN}-dev += "\ diff --git a/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch b/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch new file mode 100644 index 0000000000..2651eb6a72 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp/0001-Fix-build-with-clang-19.patch @@ -0,0 +1,56 @@ +From 1a5b4035e4cb75b87c716b4ebd5ffe32cd604c6e Mon Sep 17 00:00:00 2001 +From: "Sergey A. Osokin" <osa@FreeBSD.org.ru> +Date: Sun, 8 Sep 2024 17:14:25 -0400 +Subject: [PATCH] Fix build with clang 19 + +Please see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281359 +for details. + +Upstream-Status: Submitted [https://github.com/open-telemetry/opentelemetry-cpp/pull/3055] +Credit: Dimitry Andric <dim@FreeBSD.org> +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + api/include/opentelemetry/logs/event_logger.h | 2 +- + api/include/opentelemetry/logs/logger.h | 2 +- + api/include/opentelemetry/logs/logger_type_traits.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/api/include/opentelemetry/logs/event_logger.h b/api/include/opentelemetry/logs/event_logger.h +index b5c94a70..5892e041 100644 +--- a/api/include/opentelemetry/logs/event_logger.h ++++ b/api/include/opentelemetry/logs/event_logger.h +@@ -66,7 +66,7 @@ class EventLogger + nostd::unique_ptr<LogRecord> log_record = delegate_logger->CreateLogRecord(); + + IgnoreTraitResult( +- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( ++ detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( + log_record.get(), std::forward<ArgumentType>(args))...); + + EmitEvent(event_name, std::move(log_record)); +diff --git a/api/include/opentelemetry/logs/logger.h b/api/include/opentelemetry/logs/logger.h +index dc09a0c2..19da3942 100644 +--- a/api/include/opentelemetry/logs/logger.h ++++ b/api/include/opentelemetry/logs/logger.h +@@ -73,7 +73,7 @@ class Logger + } + + IgnoreTraitResult( +- detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set( ++ detail::LogRecordSetterTrait<typename std::decay<ArgumentType>::type>::template Set<>( + log_record.get(), std::forward<ArgumentType>(args))...); + + EmitLogRecord(std::move(log_record)); +diff --git a/api/include/opentelemetry/logs/logger_type_traits.h b/api/include/opentelemetry/logs/logger_type_traits.h +index 48613513..f140a545 100644 +--- a/api/include/opentelemetry/logs/logger_type_traits.h ++++ b/api/include/opentelemetry/logs/logger_type_traits.h +@@ -166,7 +166,7 @@ struct LogRecordSetterTrait + * = nullptr> + inline static LogRecord *Set(LogRecord *log_record, ArgumentType &&arg) noexcept + { +- return LogRecordSetterTrait<common::KeyValueIterable>::template Set( ++ return LogRecordSetterTrait<common::KeyValueIterable>::template Set<>( + log_record, std::forward<ArgumentType>(arg)); + } + diff --git a/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb b/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb index 88033e58cc..1d86f1abce 100644 --- a/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.15.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/opentelemetry/opentelemetry-cpp_1.16.1.bb @@ -8,12 +8,15 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" DEPENDS = "nlohmann-json" -SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main;" -SRCREV = "054b0dc207c1f58e290d78cdaac5f314bc328b31" +SRC_URI = "git://github.com/open-telemetry/opentelemetry-cpp.git;protocol=https;branch=main \ + file://0001-Fix-build-with-clang-19.patch" +SRCREV = "baecbb95bd63df53e0af16e87bc683967962c5f8" S = "${WORKDIR}/git" inherit cmake pkgconfig lib_package +LDFLAGS:append:riscv32 = " -latomic" + PACKAGECONFIG ?= "opentelemety_install otlp_api" PACKAGECONFIG[opentelemety_install]="-DOPENTELEMETRY_INSTALL=ON,-DOPENTELEMETRY_INSTALL=OFF" diff --git a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb index 10545b65ea..f6f2a65752 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcp/pcp_6.0.5.bb @@ -93,6 +93,10 @@ do_install () { sed -i "s#PCP_SORT_PROG=.*#PCP_SORT_PROG=sort#" ${D}/${sysconfdir}/pcp.conf sed -i "s#PCP_ECHO_PROG=.*#PCP_ECHO_PROG=echo#" ${D}/${sysconfdir}/pcp.conf sed -i "s#PCP_WHICH_PROG=.*#PCP_WHICH_PROG=which#" ${D}/${sysconfdir}/pcp.conf + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}/${sysconfdir}/pcp.conf + sed -i -e 's#${RECIPE_SYSROOT}##g' \ + -e 's#${RECIPE_SYSROOT_NATIVE}##g' \ + -e 's#${TMPDIR}##g' ${D}${includedir}/pcp/builddefs } PACKAGES += " ${PN}-export-zabbix-agent ${PN}-testsuite \ diff --git a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb index 97a94ec973..1dfba7c716 100644 --- a/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/pcsc-tools/pcsc-tools_1.7.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENCE;md5=94d55d512a9ba36caa9b7df079bae19f" SRC_URI = "git://github.com/LudovicRousseau/pcsc-tools;protocol=https;branch=master" -SRCREV = "53834cd33155ae1f0332102b1baca6ce63660fc5" +SRCREV = "778da3d86a59f5166443118c158e11ba4da9a5f1" inherit autotools pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_2024.bb index cc0d88faca..c0c3e25de9 100644 --- a/meta-openembedded/meta-oe/recipes-support/picocom/picocom_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/picocom/picocom_2024.bb @@ -4,17 +4,14 @@ LICENSE = "GPL-2.0-or-later" HOMEPAGE = "https://gitlab.com/wsakernel/picocom" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3000e4830620e310fe65c0eb69df9e8a" -BASEPV = "2023-04" -PV = "${BASEPV}+git" - -SRCREV = "12537df0314767d5af35bddddbbca3694e6a0342" +SRCREV = "7b6acbd421a2d4ca99376b7b427828dc1bcba4d8" SRC_URI = "git://gitlab.com/wsakernel/picocom;branch=master;protocol=https \ " S = "${WORKDIR}/git" -EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${BASEPV}' \ +EXTRA_OEMAKE = "'CC=${CC}' 'LD=${CC}' 'VERSION=${PV}' \ 'CFLAGS=${CFLAGS}' 'LDFLAGS=${LDFLAGS}' " do_install () { diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb index ad6a7501c5..9337ae5966 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb @@ -10,6 +10,9 @@ inherit pkgconfig SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https" SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb index ed58c4a76f..b2f9944c16 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/icyque_git.bb @@ -12,6 +12,9 @@ inherit pkgconfig SRC_URI = "git://github.com/EionRobb/icyque;branch=master;protocol=https" SRCREV = "513fc162d5d1a201c2b044e2b42941436d1069d5" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_compile() { diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb index d17a623063..f2fe4a7a93 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/libgnt_2.14.1.bb +++ b/meta-openembedded/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 \ " SRC_URI[sha256sum] = "5ec3e68e18f956e9998d79088b299fa3bca689bcc95c86001bc5da17c1eb4bd8" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/pidgin/files/libgnt/" +UPSTREAM_CHECK_REGEX = "${BPN}/(?P<pver>\d+(\.\d+)+)" + EXTRA_OEMESON = "-Dintrospection=false -Ddoc=false" FILES:${PN} += "${libdir}/gnt/s.so ${libdir}/gnt/irssi.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb index 6ce42ec187..e96e118611 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin-sipe_1.25.0.bb @@ -37,3 +37,7 @@ FILES:${PN} += " \ ${datadir}/appdata \ ${datadir}/metainfo \ " + +# http://errors.yoctoproject.org/Errors/Details/766947/ +# 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] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch new file mode 100644 index 0000000000..4e088ffc11 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch @@ -0,0 +1,177 @@ +# HG changeset patch +# User Yoann Congal <yoann.congal@smile.fr> +# Date 1720270125 -7200 +# Sat Jul 06 14:48:45 2024 +0200 +# Branch gcc-14-incompatible-pointer-types +# Node ID 06721b86a5a8e6fb8163d9411a7778d2a0274b26 +# Parent 21a56db5f9987efb88d76ab26ee1eadf316f3d7d +Fix incompatible pointer types for GtkItemFactoryCallbacks on gcc-14 + +The GtkItemFactoryEntry struct callback is of type GtkItemFactoryCallbacks +(aka void (*)(void)) but is initialised with GtkItemFactoryCallback1 types +(aka void (*)(void *, guint, GtkWidget *)). + +This is coherent with the gtk-2 documentation: +> gtk_item_factory_create_items(..., GtkItemFactoryEntry *entries,...) +> entries : an array of GtkItemFactoryEntrys whose callback members must by of +> type GtkItemFactoryCallback1 + +But, under gcc-14, the implicit cast from GtkItemFactoryCallback1 to +GtkItemFactoryCallback triggers an incompatible-pointer-types error (See [0]). + +An exemple of this error: +pidgin/gtkconv.c:3096:66: error: initialization of 'void (*)(void)' from incompatible pointer type 'void (*)(void *, guint, GtkWidget *)' {aka 'void (*)(void *, unsigned int, struct _GtkWidget *)'} [-Wincompatible-pointer-types] + 3096 | { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, + | ^~~~~~~~~~~~~~~~ +pidgin/gtkconv.c:3096:66: note: (near initialization for 'menu_items[1].callback') + +To fix this, explicitely cast to GtkItemFactoryCallback where needed. + +Testing Done: +Built with gcc-14, started and clicked on some affected menus + +[0]: https://gcc.gnu.org/gcc-14/porting_to.html#incompatible-pointer-types + +Upstream-Status: Backport [https://keep.imfreedom.org/pidgin/pidgin/rev/210f318db492] +Signed-off-by: Yoann Congal <yoann.congal@smile.fr> + +diff --git a/pidgin/gtkblist.c b/pidgin/gtkblist.c +--- a/pidgin/gtkblist.c ++++ b/pidgin/gtkblist.c +@@ -3624,11 +3624,11 @@ static GtkItemFactoryEntry blist_menu[] + { N_("/Buddies/View User _Log..."), "<CTL>L", pidgin_dialogs_log, 0, "<Item>", NULL }, + { "/Buddies/sep1", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Buddies/Sh_ow"), NULL, NULL, 0, "<Branch>", NULL}, +- { N_("/Buddies/Show/_Offline Buddies"), NULL, pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/_Empty Groups"), NULL, pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/Buddy _Details"), NULL, pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/Idle _Times"), NULL, pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, +- { N_("/Buddies/Show/_Protocol Icons"), NULL, pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Offline Buddies"), NULL, (GtkItemFactoryCallback)pidgin_blist_edit_mode_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Empty Groups"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_empty_groups_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/Buddy _Details"), NULL, (GtkItemFactoryCallback)pidgin_blist_buddy_details_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/Idle _Times"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_idle_time_cb, 1, "<CheckItem>", NULL }, ++ { N_("/Buddies/Show/_Protocol Icons"), NULL, (GtkItemFactoryCallback)pidgin_blist_show_protocol_icons_cb, 1, "<CheckItem>", NULL }, + { N_("/Buddies/_Sort Buddies"), NULL, NULL, 0, "<Branch>", NULL }, + { "/Buddies/sep2", NULL, NULL, 0, "<Separator>", NULL }, + { N_("/Buddies/_Add Buddy..."), "<CTL>B", pidgin_blist_add_buddy_cb, 0, "<StockItem>", GTK_STOCK_ADD }, +@@ -3651,11 +3651,11 @@ static GtkItemFactoryEntry blist_menu[] + { N_("/Tools/Pr_ivacy"), NULL, pidgin_privacy_dialog_show, 0, "<Item>", NULL }, + { N_("/Tools/Set _Mood"), "<CTL>D", set_mood_show, 0, "<Item>", NULL }, + { "/Tools/sep2", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Tools/_File Transfers"), "<CTL>T", pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, ++ { N_("/Tools/_File Transfers"), "<CTL>T", (GtkItemFactoryCallback)pidgin_xfer_dialog_show, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_TRANSFER }, + { N_("/Tools/R_oom List"), NULL, pidgin_roomlist_dialog_show, 0, "<Item>", NULL }, + { N_("/Tools/System _Log"), NULL, gtk_blist_show_systemlog_cb, 3, "<Item>", NULL }, + { "/Tools/sep3", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Tools/Mute _Sounds"), NULL, pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Tools/Mute _Sounds"), NULL, (GtkItemFactoryCallback)pidgin_blist_mute_sounds_cb, 0, "<CheckItem>", NULL }, + /* Help */ + { N_("/_Help"), NULL, NULL, 0, "<Branch>", NULL }, + { N_("/Help/Online _Help"), "F1", gtk_blist_show_onlinehelp_cb, 0, "<StockItem>", GTK_STOCK_HELP }, +diff --git a/pidgin/gtkconv.c b/pidgin/gtkconv.c +--- a/pidgin/gtkconv.c ++++ b/pidgin/gtkconv.c +@@ -3093,76 +3093,76 @@ static GtkItemFactoryEntry menu_items[] + /* Conversation menu */ + { N_("/_Conversation"), NULL, NULL, 0, "<Branch>", NULL }, + +- { N_("/Conversation/New Instant _Message..."), "<CTL>M", menu_new_conv_cb, ++ { N_("/Conversation/New Instant _Message..."), "<CTL>M", (GtkItemFactoryCallback)menu_new_conv_cb, + 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_MESSAGE_NEW }, +- { N_("/Conversation/Join a _Chat..."), NULL, menu_join_chat_cb, ++ { N_("/Conversation/Join a _Chat..."), NULL, (GtkItemFactoryCallback)menu_join_chat_cb, + 0, "<StockItem>", PIDGIN_STOCK_CHAT }, + + { "/Conversation/sep0", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/_Find..."), NULL, menu_find_cb, 0, ++ { N_("/Conversation/_Find..."), NULL, (GtkItemFactoryCallback)menu_find_cb, 0, + "<StockItem>", GTK_STOCK_FIND }, +- { N_("/Conversation/View _Log"), NULL, menu_view_log_cb, 0, "<Item>", NULL }, +- { N_("/Conversation/_Save As..."), NULL, menu_save_as_cb, 0, ++ { N_("/Conversation/View _Log"), NULL, (GtkItemFactoryCallback)menu_view_log_cb, 0, "<Item>", NULL }, ++ { N_("/Conversation/_Save As..."), NULL, (GtkItemFactoryCallback)menu_save_as_cb, 0, + "<StockItem>", GTK_STOCK_SAVE_AS }, +- { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, ++ { N_("/Conversation/Clea_r Scrollback"), "<CTL>L", (GtkItemFactoryCallback)menu_clear_cb, 0, "<StockItem>", GTK_STOCK_CLEAR }, + + { "/Conversation/sep1", NULL, NULL, 0, "<Separator>", NULL }, + + #ifdef USE_VV + { N_("/Conversation/M_edia"), NULL, NULL, 0, "<Branch>", NULL }, + +- { N_("/Conversation/Media/_Audio Call"), NULL, menu_initiate_media_call_cb, 0, ++ { N_("/Conversation/Media/_Audio Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_AUDIO_CALL }, +- { N_("/Conversation/Media/_Video Call"), NULL, menu_initiate_media_call_cb, 1, ++ { N_("/Conversation/Media/_Video Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 1, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, +- { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, menu_initiate_media_call_cb, 2, ++ { N_("/Conversation/Media/Audio\\/Video _Call"), NULL, (GtkItemFactoryCallback)menu_initiate_media_call_cb, 2, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_VIDEO_CALL }, + #endif + +- { N_("/Conversation/Se_nd File..."), NULL, menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, +- { N_("/Conversation/Get _Attention"), NULL, menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, +- { N_("/Conversation/Add Buddy _Pounce..."), NULL, menu_add_pounce_cb, ++ { N_("/Conversation/Se_nd File..."), NULL, (GtkItemFactoryCallback)menu_send_file_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_FILE }, ++ { N_("/Conversation/Get _Attention"), NULL, (GtkItemFactoryCallback)menu_get_attention_cb, 0, "<StockItem>", PIDGIN_STOCK_TOOLBAR_SEND_ATTENTION }, ++ { N_("/Conversation/Add Buddy _Pounce..."), NULL, (GtkItemFactoryCallback)menu_add_pounce_cb, + 0, "<Item>", NULL }, +- { N_("/Conversation/_Get Info"), "<CTL>O", menu_get_info_cb, 0, ++ { N_("/Conversation/_Get Info"), "<CTL>O", (GtkItemFactoryCallback)menu_get_info_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_USER_INFO }, +- { N_("/Conversation/In_vite..."), NULL, menu_invite_cb, 0, ++ { N_("/Conversation/In_vite..."), NULL, (GtkItemFactoryCallback)menu_invite_cb, 0, + "<Item>", NULL }, + { N_("/Conversation/M_ore"), NULL, NULL, 0, "<Branch>", NULL }, + + { "/Conversation/sep2", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/Al_ias..."), NULL, menu_alias_cb, 0, ++ { N_("/Conversation/Al_ias..."), NULL, (GtkItemFactoryCallback)menu_alias_cb, 0, + "<Item>", NULL }, +- { N_("/Conversation/_Block..."), NULL, menu_block_cb, 0, ++ { N_("/Conversation/_Block..."), NULL, (GtkItemFactoryCallback)menu_block_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_BLOCK }, +- { N_("/Conversation/_Unblock..."), NULL, menu_unblock_cb, 0, ++ { N_("/Conversation/_Unblock..."), NULL, (GtkItemFactoryCallback)menu_unblock_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_UNBLOCK }, +- { N_("/Conversation/_Add..."), NULL, menu_add_remove_cb, 0, ++ { N_("/Conversation/_Add..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, + "<StockItem>", GTK_STOCK_ADD }, +- { N_("/Conversation/_Remove..."), NULL, menu_add_remove_cb, 0, ++ { N_("/Conversation/_Remove..."), NULL, (GtkItemFactoryCallback)menu_add_remove_cb, 0, + "<StockItem>", GTK_STOCK_REMOVE }, + + { "/Conversation/sep3", NULL, NULL, 0, "<Separator>", NULL }, + +- { N_("/Conversation/Insert Lin_k..."), NULL, menu_insert_link_cb, 0, ++ { N_("/Conversation/Insert Lin_k..."), NULL, (GtkItemFactoryCallback)menu_insert_link_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_LINK }, +- { N_("/Conversation/Insert Imag_e..."), NULL, menu_insert_image_cb, 0, ++ { N_("/Conversation/Insert Imag_e..."), NULL, (GtkItemFactoryCallback)menu_insert_image_cb, 0, + "<StockItem>", PIDGIN_STOCK_TOOLBAR_INSERT_IMAGE }, + + { "/Conversation/sep4", NULL, NULL, 0, "<Separator>", NULL }, + + +- { N_("/Conversation/_Close"), NULL, menu_close_conv_cb, 0, ++ { N_("/Conversation/_Close"), NULL, (GtkItemFactoryCallback)menu_close_conv_cb, 0, + "<StockItem>", GTK_STOCK_CLOSE }, + + /* Options */ + { N_("/_Options"), NULL, NULL, 0, "<Branch>", NULL }, +- { N_("/Options/Enable _Logging"), NULL, menu_logging_cb, 0, "<CheckItem>", NULL }, +- { N_("/Options/Enable _Sounds"), NULL, menu_sounds_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Enable _Logging"), NULL, (GtkItemFactoryCallback)menu_logging_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Enable _Sounds"), NULL, (GtkItemFactoryCallback)menu_sounds_cb, 0, "<CheckItem>", NULL }, + { "/Options/sep0", NULL, NULL, 0, "<Separator>", NULL }, +- { N_("/Options/Show Formatting _Toolbars"), NULL, menu_toolbar_cb, 0, "<CheckItem>", NULL }, +- { N_("/Options/Show Ti_mestamps"), NULL, menu_timestamps_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Show Formatting _Toolbars"), NULL, (GtkItemFactoryCallback)menu_toolbar_cb, 0, "<CheckItem>", NULL }, ++ { N_("/Options/Show Ti_mestamps"), NULL, (GtkItemFactoryCallback)menu_timestamps_cb, 0, "<CheckItem>", NULL }, + }; + + static const int menu_item_count = diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch deleted file mode 100644 index 1c4daa9f67..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin/purple-OE-branding-25.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 43e9db656431ffb22b429d5fca4ce3b4af21bc9e Mon Sep 17 00:00:00 2001 -From: Herrie <github.com@herrie.org> -Date: Mon, 24 Jul 2017 21:30:16 +0200 - ---- -Upstream-Status: Pending - - libpurple/protocols/irc/irc.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libpurple/protocols/irc/irc.h b/libpurple/protocols/irc/irc.h -index 596ddaf..b70f3a9 100644 ---- a/libpurple/protocols/irc/irc.h -+++ b/libpurple/protocols/irc/irc.h -@@ -40,9 +40,9 @@ - - #define IRC_DEFAULT_CHARSET "UTF-8" - #define IRC_DEFAULT_AUTODETECT FALSE --#define IRC_DEFAULT_ALIAS "purple" -+#define IRC_DEFAULT_ALIAS "OE-user" - --#define IRC_DEFAULT_QUIT "Leaving." -+#define IRC_DEFAULT_QUIT "Powered by OE: www.openembedded.org" - - #define IRC_BUFSIZE_INCREMENT 1024 - #define IRC_MAX_BUFSIZE 16384 diff --git a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb index ae251b5a08..ac62863f5c 100644 --- a/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/pidgin/pidgin_2.14.13.bb @@ -10,10 +10,10 @@ inherit autotools gettext pkgconfig gconf perlnative python3native SRC_URI = "\ ${SOURCEFORGE_MIRROR}/pidgin/pidgin-${PV}.tar.bz2 \ file://sanitize-configure.ac.patch \ - file://purple-OE-branding-25.patch \ + file://fix_incompatible_pointer_types_for_gtkitemfactorycallbacks_on_gcc-14.patch \ " -SRC_URI[sha256sum] = "19654ad276b149646371fbdac21bc7620742f2975f7399fed0ffc1a18fbaf603" +SRC_URI[sha256sum] = "120049dc8e17e09a2a7d256aff2191ff8491abb840c8c7eb319a161e2df16ba8" CVE_STATUS[CVE-2010-1624] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." @@ -21,7 +21,6 @@ CVE_STATUS[CVE-2011-3594] = "fixed-version: The CPE in the NVD database doesn't PACKAGECONFIG ??= "gnutls consoleui avahi dbus idn nss \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 gtk startup-notification', '', d)} \ " -PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" # --disable-gstreamer compile without GStreamer audio support # --disable-gstreamer-video # compile without GStreamer 1.0 Video Overlay support @@ -29,8 +28,7 @@ PACKAGECONFIG[farsight2] = "--enable-farstream,--disable-farstream,farsight2" # compile without GStreamer 0.10 interface support # --with-gstreamer=<version> # compile with GStreamer 0.10 or 1.0 interface -PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer" -PACKAGECONFIG[vv] = "--enable-vv,--disable-vv,gstreamer" +PACKAGECONFIG[gstreamer] = "--enable-gstreamer,--disable-gstreamer,gstreamer1.0" PACKAGECONFIG[idn] = "--enable-idn,--disable-idn,libidn" PACKAGECONFIG[gtk] = "--enable-gtkui,--disable-gtkui,gtk+" PACKAGECONFIG[x11] = "--with-x=yes --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR},--with-x=no,virtual/libx11" @@ -51,8 +49,17 @@ EXTRA_OECONF = " \ --disable-meanwhile \ --disable-nm \ --disable-screensaver \ + --disable-farstream \ + --disable-vv \ " +# CONFIG_ARGS is used to display build info. Replace full paths by reproducible +# variables ($S, $WORKDIR) +do_configure:append() { + sed -i -e "/CONFIG_ARGS/s|${S}|\$S|g" ${B}/config.h + sed -i -e "/CONFIG_ARGS/s|${WORKDIR}|\$WORKDIR|g" ${B}/config.h +} + OE_LT_RPATH_ALLOW=":${libdir}/purple-2:" OE_LT_RPATH_ALLOW[export]="1" @@ -73,7 +80,7 @@ FILES:finch = "${bindir}/finch" FILES:finch-dev = "${libdir}/finch/*.la" FILES:${PN} = "${bindir} ${datadir}/${PN} ${libdir}/${PN}/*.so \ - ${datadir}/applications" + ${datadir}/applications ${datadir}/metainfo" RRECOMMENDS:${PN} = "${PN}-data libpurple-protocol-irc libpurple-protocol-xmpp" FILES:${PN}-data = "${datadir}/pixmaps ${datadir}/sounds ${datadir}/icons ${datadir}/appdata" diff --git a/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch new file mode 100644 index 0000000000..189a0e21b3 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider/0001-Fix-types-for-old-32-bit-systems.patch @@ -0,0 +1,49 @@ +From 088f038de633b5de777fb0f95cd9598f320151f6 Mon Sep 17 00:00:00 2001 +From: Simo Sorce <simo@redhat.com> +Date: Wed, 5 Jun 2024 11:22:35 -0400 +Subject: [PATCH] Fix types for old 32 bit systems + +On x86 CK_ULONG and size_t have different sizes, ensure we use +compatible types on our helper functions. + +Signed-off-by: Simo Sorce <simo@redhat.com> +Signed-off-by: Martin Jansa <martin.jansa@gmail.com> +--- +Upstream-Status: Backport [https://github.com/latchset/pkcs11-provider/commit/9fa16b7fd398b62f06cb10892fe93dc574d67399] + + src/asymmetric_cipher.c | 4 ++-- + src/util.h | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/asymmetric_cipher.c b/src/asymmetric_cipher.c +index 4d87b1c..3256fd2 100644 +--- a/src/asymmetric_cipher.c ++++ b/src/asymmetric_cipher.c +@@ -251,12 +251,12 @@ static int p11prov_rsaenc_decrypt_init(void *ctx, void *provkey, + static int + p11prov_tls_constant_time_depadding(struct p11prov_rsaenc_ctx *encctx, + unsigned char *out, unsigned char *buf, +- size_t *out_size, CK_ULONG *ret_cond) ++ CK_ULONG *out_size, CK_ULONG *ret_cond) + { + unsigned char randbuf[SSL_MAX_MASTER_KEY_LENGTH]; + CK_ULONG ver_cond = 0; + CK_ULONG cond = 0; +- size_t length = SSL_MAX_MASTER_KEY_LENGTH; ++ CK_ULONG length = SSL_MAX_MASTER_KEY_LENGTH; + int err; + + /* always generate a random buffer, to constant_time swap in +diff --git a/src/util.h b/src/util.h +index bcbc2db..1b24666 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -120,7 +120,7 @@ static inline int constant_select_int(CK_ULONG cond, int a, int b) + return (int)((A & mask) | (B & ~mask)); + } + +-static inline void constant_select_buf(CK_ULONG cond, size_t size, ++static inline void constant_select_buf(CK_ULONG cond, CK_ULONG size, + unsigned char *dst, unsigned char *a, + unsigned char *b) + { diff --git a/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb index 816ee967c1..fcd8fe631e 100644 --- a/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/pkcs11-provider/pkcs11-provider_0.5.bb @@ -10,18 +10,16 @@ HOMEPAGE = "https://github.com/latchset/pkcs11-provider" SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=b53b787444a60266932bd270d1cf2d45" -DEPENDS = "\ - autoconf-archive \ - openssl \ - p11-kit \ -" +DEPENDS = "openssl" -SRCREV = "58040b4e32975cc1d7f39e424ee7b0097cd11311" +SRCREV = "3a4fdd2a2e5643af2a0f857b66a19b9fa109d40f" -SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https" +SRC_URI = "git://github.com/latchset/${BPN}.git;branch=main;protocol=https \ + file://0001-Fix-types-for-old-32-bit-systems.patch \ +" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit meson pkgconfig FILES:${PN} += "${libdir}/ossl-modules/pkcs11.so" diff --git a/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb index 19da947d04..9cd27a2e63 100644 --- a/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/pngcheck/pngcheck_2.3.0.bb @@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/png-mng/${BPN}/${PV}/${BPN}-${PV}.tar.g SRC_URI[md5sum] = "980bd6d9a3830fdce746d7fe3c9166ee" SRC_URI[sha256sum] = "77f0a039ac64df55fbd06af6f872fdbad4f639d009bbb5cd5cbe4db25690f35f" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/png-mng/files/pngcheck/" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + CFLAGS += "-DUSE_ZLIB" EXTRA_OEMAKE = "-f ${S}/Makefile.unx" diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/poco/poco/0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 4cbb225811205b51b65371d0d8abc2d2af8233b6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 26 Jan 2023 14:56:36 -0800 -Subject: [PATCH] Use std::atomic<int> instead of std::atomic<bool> - -GCC on RISCV does not yet support inline subword atomics [1] -Therefore avoid them until fixed - -Upstream-Status: Pending - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104338 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Foundation/include/Poco/AsyncChannel.h | 2 +- - Foundation/src/AsyncChannel.cpp | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Foundation/include/Poco/AsyncChannel.h b/Foundation/include/Poco/AsyncChannel.h -index 190bae7dd..d73ea6c72 100644 ---- a/Foundation/include/Poco/AsyncChannel.h -+++ b/Foundation/include/Poco/AsyncChannel.h -@@ -111,7 +111,7 @@ private: - NotificationQueue _queue; - std::size_t _queueSize = 0; - std::size_t _dropCount = 0; -- std::atomic<bool> _closed; -+ std::atomic<int> _closed; - }; - - -diff --git a/Foundation/src/AsyncChannel.cpp b/Foundation/src/AsyncChannel.cpp -index 37cdec477..e829b180c 100644 ---- a/Foundation/src/AsyncChannel.cpp -+++ b/Foundation/src/AsyncChannel.cpp -@@ -48,11 +48,10 @@ private: - Message _msg; - }; - -- - AsyncChannel::AsyncChannel(Channel::Ptr pChannel, Thread::Priority prio): - _pChannel(pChannel), - _thread("AsyncChannel"), -- _closed(false) -+ _closed(0) - { - _thread.setPriority(prio); - } -@@ -95,7 +94,7 @@ void AsyncChannel::open() - - void AsyncChannel::close() - { -- if (!_closed.exchange(true)) -+ if (!_closed.exchange(1)) - { - if (_thread.isRunning()) - { --- -2.39.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.13.3.bb b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.13.3.bb index 6ad577b37b..0beffab99f 100644 --- a/meta-openembedded/meta-oe/recipes-support/poco/poco_1.13.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/poco/poco_1.13.3.bb @@ -8,12 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=4267f48fc738f50380cbeeb76f95cebc" # These dependencies are required by Foundation DEPENDS = "libpcre2 zlib" -SRC_URI = "git://github.com/pocoproject/poco.git;branch=master-unused;protocol=https \ - file://0001-Use-std-atomic-int-instead-of-std-atomic-bool.patch \ +SRC_URI = "git://github.com/pocoproject/poco.git;branch=poco-1.13.3;protocol=https \ file://0001-cppignore.lnx-Ignore-PKCS12-and-testLaunch-test.patch \ file://run-ptest \ " -SRCREV = "d6bd48a94c5f03e3c69cac1b024fdad5120e3a7b" +SRCREV = "7f848d25aa0461d3beeff1189dc61b48ffe8e2f4" UPSTREAM_CHECK_GITTAGREGEX = "poco-(?P<pver>\d+(\.\d+)+)" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch index adbe82263f..ab2fbf7d9b 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/0001-cmake-Do-not-use-isystem.patch @@ -40,11 +40,9 @@ Upstream-Status: Pending utils/CMakeLists.txt | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c6c757c..5f1c540 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -603,10 +603,10 @@ add_library(poppler ${poppler_SRCS}) +@@ -628,10 +628,10 @@ add_library(poppler ${poppler_SRCS} ${LI if (OpenJPEG_FOUND) # check if we can remove this when we depend on newer openjpeg versions, 2.5 seems fixed # target openjp2 may lack interface include directories @@ -56,9 +54,7 @@ index c6c757c..5f1c540 100644 + target_include_directories(poppler PRIVATE ${LCMS2_INCLUDE_DIR}) endif() generate_export_header(poppler BASE_NAME poppler-private EXPORT_FILE_NAME "${CMAKE_CURRENT_BINARY_DIR}/poppler_private_export.h") - set_target_properties(poppler PROPERTIES VERSION 127.0.0 SOVERSION 127) -diff --git a/glib/CMakeLists.txt b/glib/CMakeLists.txt -index 52e8687..08ab39a 100644 + set_target_properties(poppler PROPERTIES --- a/glib/CMakeLists.txt +++ b/glib/CMakeLists.txt @@ -4,7 +4,7 @@ include_directories( @@ -66,7 +62,7 @@ index 52e8687..08ab39a 100644 include_directories( - SYSTEM -+ ++ ${GLIB2_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} ) @@ -78,9 +74,7 @@ index 52e8687..08ab39a 100644 +target_include_directories(poppler-glib PRIVATE ${CAIRO_INCLUDE_DIRS}) install(TARGETS poppler-glib RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES -diff --git a/qt5/src/CMakeLists.txt b/qt5/src/CMakeLists.txt -index 5db3a6c..f242d29 100644 + if (ENABLE_NSS3) --- a/qt5/src/CMakeLists.txt +++ b/qt5/src/CMakeLists.txt @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) @@ -97,8 +91,6 @@ index 5db3a6c..f242d29 100644 endif() install(TARGETS poppler-qt5 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/qt6/src/CMakeLists.txt b/qt6/src/CMakeLists.txt -index cd91975..6c42e12 100644 --- a/qt6/src/CMakeLists.txt +++ b/qt6/src/CMakeLists.txt @@ -45,11 +45,11 @@ if(MINGW AND BUILD_SHARED_LIBS) @@ -115,8 +107,6 @@ index cd91975..6c42e12 100644 endif() install(TARGETS poppler-qt6 RUNTIME DESTINATION bin LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) -diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt -index afa1352..9bd3b9a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -23,7 +23,7 @@ if (GTK_FOUND) @@ -146,11 +136,9 @@ index afa1352..9bd3b9a 100644 endif () endif () -diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt -index 1c3ebcb..bc1840a 100644 --- a/utils/CMakeLists.txt +++ b/utils/CMakeLists.txt -@@ -16,7 +16,7 @@ add_executable(pdftoppm ${pdftoppm_SOURCES}) +@@ -18,7 +18,7 @@ add_executable(pdftoppm ${pdftoppm_SOURC target_link_libraries(pdftoppm ${common_libs}) if(LCMS2_FOUND) target_link_libraries(pdftoppm ${LCMS2_LIBRARIES}) @@ -159,7 +147,7 @@ index 1c3ebcb..bc1840a 100644 endif() install(TARGETS pdftoppm DESTINATION bin) install(FILES pdftoppm.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) -@@ -37,10 +37,10 @@ if (HAVE_CAIRO) +@@ -39,10 +39,10 @@ if (HAVE_CAIRO) add_definitions(${CAIRO_CFLAGS}) add_executable(pdftocairo ${pdftocairo_SOURCES}) target_link_libraries(pdftocairo ${CAIRO_LIBRARIES} Freetype::Freetype ${common_libs}) @@ -172,16 +160,16 @@ index 1c3ebcb..bc1840a 100644 endif() install(TARGETS pdftocairo DESTINATION bin) install(FILES pdftocairo.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) -@@ -99,7 +99,7 @@ if (ENABLE_NSS3) - pdfsig.cc - ) +@@ -109,7 +109,7 @@ if (ENABLE_SIGNATURES) add_executable(pdfsig ${pdfsig_SOURCES}) -- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) -+ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) target_link_libraries(pdfsig ${common_libs}) - install(TARGETS pdfsig DESTINATION bin) - install(FILES pdfsig.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) -@@ -114,7 +114,7 @@ add_executable(pdftops ${pdftops_SOURCES}) + if (ENABLE_NSS3) +- target_include_directories(pdfsig SYSTEM PRIVATE ${NSS3_INCLUDE_DIRS}) ++ target_include_directories(pdfsig PRIVATE ${NSS3_INCLUDE_DIRS}) + endif() + if (Intl_FOUND) + target_link_libraries(pdfsig Intl::Intl) +@@ -127,7 +127,7 @@ add_executable(pdftops ${pdftops_SOURCES target_link_libraries(pdftops ${common_libs}) if(LCMS2_FOUND) target_link_libraries(pdftops ${LCMS2_LIBRARIES}) diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch deleted file mode 100644 index cc942fad77..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/CVE-2023-34872.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 591235c8b6c65a2eee88991b9ae73490fd9afdfe Mon Sep 17 00:00:00 2001 -From: Albert Astals Cid <aacid@kde.org> -Date: Fri, 18 Aug 2023 11:36:06 +0000 -Subject: [PATCH] OutlineItem::open: Fix crash on malformed files - -Fixes #1399 - -CVE: CVE-2023-34872 - -Upstream-Status: Backport [https://gitlab.freedesktop.org/poppler/poppler/-/commit/591235c8b6c65a2eee88991b9ae73490fd9afdfe] - -Signed-off-by: Yogita Urade <yogita.urade@windriver.com> ---- - poppler/Outline.cc | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/poppler/Outline.cc b/poppler/Outline.cc -index cbb6cb4..4c68be9 100644 ---- a/poppler/Outline.cc -+++ b/poppler/Outline.cc -@@ -14,7 +14,7 @@ - // under GPL version 2 or later - // - // Copyright (C) 2005 Marco Pesenti Gritti <mpg@redhat.com> --// Copyright (C) 2008, 2016-2019, 2021 Albert Astals Cid <aacid@kde.org> -+// Copyright (C) 2008, 2016-2019, 2021, 2023 Albert Astals Cid <aacid@kde.org> - // Copyright (C) 2009 Nick Jones <nick.jones@network-box.com> - // Copyright (C) 2016 Jason Crain <jason@aquaticape.us> - // Copyright (C) 2017 Adrian Johnson <ajohnson@redneon.com> -@@ -483,8 +483,12 @@ void OutlineItem::open() - { - if (!kids) { - Object itemDict = xref->fetch(ref); -- const Object &firstRef = itemDict.dictLookupNF("First"); -- kids = readItemList(this, &firstRef, xref, doc); -+ if (itemDict.isDict()) { -+ const Object &firstRef = itemDict.dictLookupNF("First"); -+ kids = readItemList(this, &firstRef, xref, doc); -+ } else { -+ kids = new std::vector<OutlineItem *>(); -+ } - } - } - --- -2.35.5 diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch b/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch deleted file mode 100644 index 70ba1cf123..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler/jpeg-stdio.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 2986f06c7cc9d64a506ebe861b8bf38f73386e86 Mon Sep 17 00:00:00 2001 -From: Jordan Abrahams-Whitehead <ajordanr@google.com> -Date: Tue, 16 May 2023 18:52:19 +0000 -Subject: [PATCH] Add missing #include <cstdio> prior to jpeglib.h - -Fixes #1398 - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@arm.com> ---- - goo/JpegWriter.cc | 2 +- - poppler/ImageEmbeddingUtils.cc | 1 + - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/goo/JpegWriter.cc b/goo/JpegWriter.cc -index ca69fd055..566ee38f8 100644 ---- a/goo/JpegWriter.cc -+++ b/goo/JpegWriter.cc -@@ -23,7 +23,7 @@ - #ifdef ENABLE_LIBJPEG - - # include "poppler/Error.h" -- -+# include <cstdio> - extern "C" { - # include <jpeglib.h> - } -diff --git a/poppler/ImageEmbeddingUtils.cc b/poppler/ImageEmbeddingUtils.cc -index 0c13fe968..07b9dfb62 100644 ---- a/poppler/ImageEmbeddingUtils.cc -+++ b/poppler/ImageEmbeddingUtils.cc -@@ -14,6 +14,7 @@ - - #include <memory> - #ifdef ENABLE_LIBJPEG -+# include <cstdio> - extern "C" { - # include <jpeglib.h> - } --- -GitLab diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_24.09.0.bb index f4411e1163..fb6b534cf4 100644 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_23.04.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_24.09.0.bb @@ -7,24 +7,24 @@ SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ file://0001-Do-not-overwrite-all-our-build-flags.patch \ file://basename-include.patch \ file://0001-cmake-Do-not-use-isystem.patch \ - file://jpeg-stdio.patch \ - file://CVE-2023-34872.patch \ " -SRC_URI[sha256sum] = "b6d893dc7dcd4138b9e9df59a13c59695e50e80dc5c2cacee0674670693951a1" +SRC_URI[sha256sum] = "ebd857987e2395608c69fdc44009692d5906f13b612c5280beff65a0b75dc255" DEPENDS = "fontconfig zlib cairo lcms glib-2.0 glib-2.0-native" inherit cmake pkgconfig gobject-introspection -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG ??= "boost jpeg nss openjpeg png tiff" +PACKAGECONFIG[boost] = "-DENABLE_BOOST=ON,-DENABLE_BOOST=OFF,boost" PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[tiff] = "-DENABLE_LIBTIFF=ON,-DENABLE_LIBTIFF=OFF,tiff" PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON -DENABLE_BOOST=ON,-DENABLE_SPLASH=OFF -DENABLE_BOOST=OFF,boost" +PACKAGECONFIG[nss] = "-DENABLE_NSS3=ON,-DENABLE_NSS3=OFF,nss" +PACKAGECONFIG[gpgme] = "-DENABLE_GPGME=ON,-DENABLE_GPGME=OFF,gpgme" +PACKAGECONFIG[qt6] = "-DENABLE_QT6=ON,-DENABLE_QT6=OFF,qtbase" # surprise - did not expect this to work :) inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} @@ -32,10 +32,9 @@ inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ + -DENABLE_LCMS=ON \ -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ -DRUN_GPERF_IF_PRESENT=OFF \ -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ diff --git a/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb b/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb index 16917666a4..abb87f9935 100644 --- a/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/procmail/procmail_3.22.bb @@ -33,7 +33,7 @@ do_configure() { } do_compile() { - oe_runmake -i TARGET_CFLAGS="$TARGET_CFLAGS -Wno-comments -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" + oe_runmake -i CFLAGS="$TARGET_CFLAGS -Wno-comments -Wno-implicit-int -Wno-implicit-function-declaration -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS0="${LDFLAGS}" } do_install() { diff --git a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb index 6a739af927..ac26ef9365 100644 --- a/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb +++ b/meta-openembedded/meta-oe/recipes-support/pv/pv_1.6.20.bb @@ -11,7 +11,7 @@ SRC_URI = "https://www.ivarch.com/programs/sources/${BP}.tar.bz2 \ SRC_URI[sha256sum] = "e831951eff0718fba9b1ef286128773b9d0e723e1fbfae88d5a3188814fdc603" UPSTREAM_CHECK_URI = "http://www.ivarch.com/programs/pv.shtml" -UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar.bz2" +UPSTREAM_CHECK_REGEX = "pv-(?P<pver>\d+(\.\d+)+).tar" inherit autotools ptest diff --git a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/raptor2/raptor2/raptor-2.0.16-dont_use_curl-config.patch @@ -0,0 +1,73 @@ +Do not use curl-config + +Sourced from +https://bugs.gentoo.org/552474 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/configure.ac ++++ b/configure.ac +@@ -596,49 +596,12 @@ else + PKG_CHECK_MODULES([XSLT], [libxslt > $libxslt_min_version], [have_libxslt=1], [have_libxslt=0]) + fi + +-dnl curl +-AC_ARG_WITH(curl-config, [ --with-curl-config=PATH Location of libcurl curl-config []], curl_config="$withval", curl_config="") +- +-if test "X$curl_config" != "Xno" ; then +- if test "X$curl_config" != "X" ; then +- AC_MSG_CHECKING(for $curl_config) +- +- if test -f $curl_config ; then +- CURL_CONFIG=$curl_config +- AC_MSG_RESULT(yes) +- else +- AC_MSG_RESULT(no - searching PATH) +- fi +- fi +- if test "X$CURL_CONFIG" = "X" ; then +- AC_CHECK_PROGS(CURL_CONFIG, curl-config) +- fi +-fi +- + libcurl_source=no +-if test "X$CURL_CONFIG" != "X"; then +- LIBCURL_CFLAGS=`$CURL_CONFIG --cflags` +- LIBCURL_LIBS=`$CURL_CONFIG --libs` +- +- CPPFLAGS="$LIBCURL_CFLAGS $CPPFLAGS" +- LIBS="$LIBS $LIBCURL_LIBS" +- AC_CHECK_HEADER(curl/curl.h) +- AC_CHECK_FUNC(curl_easy_init, have_curl_easy_init=yes, have_curl_easy_init=no) +- +- AC_MSG_CHECKING(for libcurl via curl-config) +- if test $have_curl_easy_init = yes; then +- libcurl_source="curl-config" +- LIBCURL_VERSION=`$CURL_CONFIG --version | sed -e 's/^libcurl *//'` +- fi +- CPPFLAGS="$oCPPFLAGS" +- LIBS="$oLIBS" +-else +- PKG_CHECK_MODULES([LIBCURL],[libcurl],[ +- LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` +- libcurl_source="pkg-config" +- ], [:]) +- AC_MSG_CHECKING(for libcurl via pkg-config) +-fi ++PKG_CHECK_MODULES([LIBCURL],[libcurl],[ ++ LIBCURL_VERSION=`$PKG_CONFIG libcurl --modversion` ++ libcurl_source="pkg-config" ++], [:]) ++AC_MSG_CHECKING(for libcurl via pkg-config) + + if test "$libcurl_source" = "no"; then + AC_MSG_RESULT(no - not found) +@@ -1033,7 +996,7 @@ need_libcurl=0 + need_libxml_www=0 + need_libfetch=0 + +-if test "X$CURL_CONFIG" != X; then ++if test "$libcurl_source" != "no"; then + CPPFLAGS="$CPPFLAGS $LIBCURL_CFLAGS" + LIBS="$LIBS $LIBCURL_LIBS" + AC_CHECK_HEADER(curl/curl.h) diff --git a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb index 85012bcfb3..7014a28c02 100644 --- a/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb +++ b/meta-openembedded/meta-oe/recipes-support/raptor2/raptor2_2.0.16.bb @@ -7,18 +7,18 @@ LIC_FILES_CHKSUM = " \ file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -DEPENDS = "libxml2 libxslt curl yajl" +DEPENDS = "bison-native flex-native libxml2 libxslt curl yajl" SRC_URI = " \ http://download.librdf.org/source/${BPN}-${PV}.tar.gz \ file://0001-Remove-the-access-to-entities-checked-private-symbol.patch \ + file://raptor-2.0.16-dont_use_curl-config.patch \ " SRC_URI[sha256sum] = "089db78d7ac982354bdbf39d973baf09581e6904ac4c92a98c5caadb3de44680" -inherit autotools pkgconfig gtk-doc +inherit autotools pkgconfig gtk-doc perlnative EXTRA_OECONF = " \ --without-xml2-config \ - --without-curl-config \ --without-xslt-config \ " diff --git a/meta-openembedded/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb b/meta-openembedded/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb index c038966ba8..5e0c6cd21c 100644 --- a/meta-openembedded/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/reboot-mode/reboot-mode_git.bb @@ -8,6 +8,9 @@ SRCREV = "84831b20512abd9033414ca5f5a023f333525335" S = "${WORKDIR}/git" +# Upstream repo has not made releases/tags after 1.0.0 +UPSTREAM_CHECK_COMMITS = "1" + do_compile() { ${CC} ${CFLAGS} ${LDFLAGS} ${S}/reboot-mode.c -o ${B}/reboot-mode } diff --git a/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb b/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb index 57b31a78d9..6889758224 100644 --- a/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/reptyr/reptyr_0.10.0.bb @@ -27,3 +27,5 @@ do_compile () { do_install () { oe_runmake install 'DESTDIR=${D}' } + +COMPATIBLE_HOST:riscv32 = "null" diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/sharutils/sharutils/0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch @@ -0,0 +1,47 @@ +From fb8bf1c1b1d0bf8e9bc637c0e67219fab1a9eb03 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 14 Aug 2024 15:24:57 -0700 +Subject: [PATCH] libopts.m4: accept POSIX_SHELL from the environment during + the configure step + +This lets us set it to the canonical path /bin/bash, even on systems +where both /bin/bash and /usr/bin/bash are available, and therefore +which(1) might return /usr/bin/bash (depending on PATH order). + +Both copies of libopts.m4 are marked as generated files, but the files +from which they were generated do not seem to be present in the sharutils +package. This change is equivalent to part of a 2016 autogen commit +<https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a>. + +Upstream-Status: Backport [https://git.savannah.gnu.org/cgit/autogen.git/commit/?id=db064b9a] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + libopts/m4/libopts.m4 | 1 + + m4/libopts.m4 | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libopts/m4/libopts.m4 b/libopts/m4/libopts.m4 +index 1a896d9..3b88426 100644 +--- a/libopts/m4/libopts.m4 ++++ b/libopts/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` +diff --git a/m4/libopts.m4 b/m4/libopts.m4 +index c7ba4f3..a1127e1 100644 +--- a/m4/libopts.m4 ++++ b/m4/libopts.m4 +@@ -114,6 +114,7 @@ AC_DEFUN([INVOKE_LIBOPTS_MACROS_FIRST],[ + AC_PROG_SED + [while : + do ++ test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which bash` + test -x "$POSIX_SHELL" && break + POSIX_SHELL=`which dash` diff --git a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb index 2a16b18288..7a506d034d 100644 --- a/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/sharutils/sharutils_4.15.2.bb @@ -13,10 +13,13 @@ SRC_URI = "${GNU_MIRROR}/${BPN}/${BP}.tar.gz \ file://0001-Fix-building-with-GCC-10.patch \ file://0002-Do-not-include-lib-md5.c-into-src-shar.c.patch \ file://0001-configure.ac-Check-and-define-intmax_t-type.patch \ + file://0001-libopts.m4-accept-POSIX_SHELL-from-the-environment-d.patch \ " SRC_URI[md5sum] = "32a51b23e25ad5e6af4b89f228be1800" SRC_URI[sha256sum] = "ee336e68549664e7a19b117adf02edfdeac6307f22e5ba78baca457116914637" +EXTRA_OECONF = "POSIX_SHELL=${base_bindir}/sh" + do_install:append() { if [ -e ${D}${libdir}/charset.alias ] then diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch b/meta-openembedded/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-openembedded/meta-oe/recipes-support/syslog-ng/files/0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 896d77dd949b52d6ea5798e5a038ba97d6b802be Mon Sep 17 00:00:00 2001 -From: Peter Marko <peter.marko@siemens.com> -Date: Thu, 4 Apr 2024 15:44:18 +0200 -Subject: [PATCH] macros: guard ipv6 code with SYSLOG_NG_ENABLE_IPV6 - -With ipv6 disabled, there are linking errors currently. -This fixes it by not using the symbols when IPv6 is disabled. - -Solves #4810 with my config options -https://github.com/openembedded/meta-openembedded/blob/2487e65ee3842b6ae0c7a2628985be6189ed9ebf/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb - -Upstream-Status: Submitted [https://github.com/syslog-ng/syslog-ng/pull/4880] - -Signed-off-by: Peter Marko <peter.marko@siemens.com> ---- - lib/template/macros.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/lib/template/macros.c b/lib/template/macros.c -index 54142706c..fcb83637f 100644 ---- a/lib/template/macros.c -+++ b/lib/template/macros.c -@@ -277,12 +277,14 @@ _get_originating_ip_protocol(const LogMessage *msg) - return 0; - if (g_sockaddr_inet_check(msg->saddr)) - return 4; -+#if SYSLOG_NG_ENABLE_IPV6 - if (g_sockaddr_inet6_check(msg->saddr)) - { - if (g_sockaddr_inet6_is_v4_mapped(msg->saddr)) - return 4; - return 6; - } -+#endif - return 0; - } - --- -2.30.2 - diff --git a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb index ab4a8d1825..588a38126b 100644 --- a/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/syslog-ng/syslog-ng_4.7.0.bb @@ -13,7 +13,7 @@ LICENSE = "GPL-2.0-only & LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=924958cefc9f7de3e0b818832b8a1cec" # util-linux added to get libuuid -DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl" +DEPENDS = "libpcre flex glib-2.0 openssl util-linux bison-native curl json-c" SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.tar.gz \ file://syslog-ng.conf.systemd \ @@ -23,11 +23,10 @@ SRC_URI = "https://github.com/balabit/syslog-ng/releases/download/${BP}/${BP}.ta file://syslog-ng-tmp.conf \ file://syslog-ng.service-the-syslog-ng-service.patch \ file://0001-Fix-buildpaths-warning.patch \ - file://0001-macros-guard-ipv6-code-with-SYSLOG_NG_ENABLE_IPV6.patch \ " SRC_URI:append:powerpc64le = " file://0001-plugin.c-workaround-powerpc64le-segfaults-error.patch" -SRC_URI[sha256sum] = "b69e3360dfb96a754a4e1cbead4daef37128b1152a23572356db4ab64a475d4f" +SRC_URI[sha256sum] = "b601265362c633a25f26c497a7e57592739d5a583b7963b722ff58f01b853506" UPSTREAM_CHECK_URI = "https://github.com/balabit/syslog-ng/releases" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch deleted file mode 100644 index 640b131703..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-hwloc_detection.cmake-remove-cross-compiation-check.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7ffc1eba8596544d6e3af0fd5f4004fff6d56f84 Mon Sep 17 00:00:00 2001 -From: Naveen Saini <naveen.kumar.saini@intel.com> -Date: Wed, 29 Nov 2023 15:48:57 +0800 -Subject: [PATCH] hwloc_detection.cmake: remove cross-compiation check - -This check is preventing pkgconfig to -search for hwloc under cross-compilation. - -pkgconfig able to find hwloc pkg from sysroot. - -Upstream-Status: Inappropriate - -Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> ---- - cmake/hwloc_detection.cmake | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/cmake/hwloc_detection.cmake b/cmake/hwloc_detection.cmake -index 47233b17..5a7e84c3 100644 ---- a/cmake/hwloc_detection.cmake -+++ b/cmake/hwloc_detection.cmake -@@ -46,8 +46,6 @@ endforeach() - unset(HWLOC_TARGET_NAME) - - if (NOT HWLOC_TARGET_EXPLICITLY_DEFINED AND -- # No hwloc auto detection for cross compilation -- NOT CMAKE_CROSSCOMPILING AND - NOT TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH - ) - find_package(PkgConfig QUIET) --- -2.37.3 - diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb index f834726bd6..e2b7543c0f 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.11.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.13.0.bb @@ -13,10 +13,10 @@ DEPENDS:append:class-target = " hwloc" PE = "1" BRANCH = "onetbb_2021" -SRCREV = "8b829acc65569019edb896c5150d427f288e8aba" +SRCREV = "1c4c93fc5398c4a1acb3492c02db4699f3048dea" SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH} \ - file://0001-hwloc_detection.cmake-remove-cross-compiation-check.patch \ -" + " + S = "${WORKDIR}/git" inherit cmake pkgconfig @@ -25,6 +25,7 @@ inherit cmake pkgconfig EXTRA_OECMAKE += " \ -DTBB_TEST=OFF \ -DCMAKE_BUILD_TYPE=Release \ + -DTBB_STRICT=OFF \ " # 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-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc index d71aa442fa..c5c059dd1a 100644 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools-crates.inc @@ -3,212 +3,214 @@ # from Cargo.lock SRC_URI += " \ crate://crates.io/adler/1.0.2 \ - crate://crates.io/aho-corasick/1.1.2 \ - crate://crates.io/anstyle/1.0.6 \ - crate://crates.io/anyhow/1.0.80 \ + crate://crates.io/aho-corasick/1.1.3 \ + crate://crates.io/anstyle/1.0.7 \ + crate://crates.io/anyhow/1.0.86 \ crate://crates.io/atty/0.2.14 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.21.7 \ + crate://crates.io/autocfg/1.3.0 \ + crate://crates.io/base64/0.22.1 \ crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/bitflags/2.4.2 \ - crate://crates.io/bytemuck/1.14.3 \ + crate://crates.io/bitflags/2.6.0 \ + crate://crates.io/bytemuck/1.16.1 \ crate://crates.io/byteorder/1.5.0 \ crate://crates.io/cassowary/0.3.0 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/clap/4.5.1 \ - crate://crates.io/clap_builder/4.5.1 \ - crate://crates.io/clap_lex/0.7.0 \ + crate://crates.io/clap/4.5.9 \ + crate://crates.io/clap_builder/4.5.9 \ + crate://crates.io/clap_lex/0.7.1 \ crate://crates.io/console/0.15.8 \ - crate://crates.io/crc32c/0.6.5 \ - crate://crates.io/crc32fast/1.4.0 \ - crate://crates.io/data-encoding/2.5.0 \ + crate://crates.io/crc32c/0.6.8 \ + crate://crates.io/crc32fast/1.4.2 \ + crate://crates.io/data-encoding/2.6.0 \ crate://crates.io/downcast/0.11.0 \ crate://crates.io/duct/0.13.7 \ crate://crates.io/encode_unicode/0.3.6 \ crate://crates.io/env_logger/0.8.4 \ - crate://crates.io/errno/0.3.8 \ + crate://crates.io/errno/0.3.9 \ crate://crates.io/exitcode/1.1.2 \ - crate://crates.io/fastrand/2.0.1 \ + crate://crates.io/fastrand/2.1.0 \ crate://crates.io/fixedbitset/0.4.2 \ - crate://crates.io/flate2/1.0.28 \ + crate://crates.io/flate2/1.0.30 \ crate://crates.io/fragile/2.0.0 \ - crate://crates.io/getrandom/0.2.12 \ + crate://crates.io/getrandom/0.2.15 \ crate://crates.io/hermit-abi/0.1.19 \ - crate://crates.io/hermit-abi/0.3.6 \ + crate://crates.io/hermit-abi/0.3.9 \ crate://crates.io/indicatif/0.17.8 \ - crate://crates.io/instant/0.1.12 \ + crate://crates.io/instant/0.1.13 \ crate://crates.io/iovec/0.1.4 \ - crate://crates.io/lazy_static/1.4.0 \ - crate://crates.io/libc/0.2.153 \ - crate://crates.io/linux-raw-sys/0.4.13 \ - crate://crates.io/log/0.4.20 \ - crate://crates.io/memchr/2.7.1 \ + crate://crates.io/lazy_static/1.5.0 \ + crate://crates.io/libc/0.2.155 \ + crate://crates.io/linux-raw-sys/0.4.14 \ + crate://crates.io/log/0.4.22 \ + crate://crates.io/memchr/2.7.4 \ crate://crates.io/minimal-lexical/0.2.1 \ - crate://crates.io/miniz_oxide/0.7.2 \ + crate://crates.io/miniz_oxide/0.7.4 \ crate://crates.io/mockall/0.12.1 \ crate://crates.io/mockall_derive/0.12.1 \ crate://crates.io/nom/7.1.3 \ crate://crates.io/num-derive/0.4.2 \ - crate://crates.io/num-traits/0.2.18 \ + crate://crates.io/num-traits/0.2.19 \ crate://crates.io/num_cpus/1.16.0 \ crate://crates.io/number_prefix/0.4.0 \ crate://crates.io/numtoa/0.1.0 \ crate://crates.io/once_cell/1.19.0 \ - crate://crates.io/os_pipe/1.1.5 \ + crate://crates.io/os_pipe/1.2.0 \ crate://crates.io/portable-atomic/1.6.0 \ crate://crates.io/ppv-lite86/0.2.17 \ crate://crates.io/predicates/3.1.0 \ crate://crates.io/predicates-core/1.0.6 \ crate://crates.io/predicates-tree/1.0.9 \ - crate://crates.io/proc-macro2/1.0.78 \ - crate://crates.io/quick-xml/0.31.0 \ + crate://crates.io/proc-macro2/1.0.86 \ + crate://crates.io/quick-xml/0.36.0 \ crate://crates.io/quickcheck/1.0.3 \ crate://crates.io/quickcheck_macros/1.0.0 \ - crate://crates.io/quote/1.0.35 \ + crate://crates.io/quote/1.0.36 \ crate://crates.io/rand/0.8.5 \ crate://crates.io/rand_chacha/0.3.1 \ crate://crates.io/rand_core/0.6.4 \ - crate://crates.io/rangemap/1.5.0 \ + crate://crates.io/rangemap/1.5.1 \ crate://crates.io/redox_syscall/0.2.16 \ crate://crates.io/redox_termios/0.1.3 \ - crate://crates.io/regex/1.10.3 \ - crate://crates.io/regex-automata/0.4.5 \ - crate://crates.io/regex-syntax/0.8.2 \ - crate://crates.io/roaring/0.10.3 \ + crate://crates.io/regex/1.10.5 \ + crate://crates.io/regex-automata/0.4.7 \ + crate://crates.io/regex-syntax/0.8.4 \ + crate://crates.io/roaring/0.10.6 \ crate://crates.io/rustc_version/0.4.0 \ - crate://crates.io/rustix/0.38.31 \ + crate://crates.io/rustix/0.38.34 \ crate://crates.io/safemem/0.3.3 \ - crate://crates.io/semver/1.0.22 \ + crate://crates.io/semver/1.0.23 \ crate://crates.io/shared_child/1.0.0 \ - crate://crates.io/strsim/0.11.0 \ + crate://crates.io/strsim/0.11.1 \ crate://crates.io/syn/1.0.109 \ - crate://crates.io/syn/2.0.50 \ - crate://crates.io/tempfile/3.10.0 \ + crate://crates.io/syn/2.0.70 \ + crate://crates.io/tempfile/3.10.1 \ crate://crates.io/termion/1.5.6 \ crate://crates.io/termtree/0.4.1 \ - crate://crates.io/thiserror/1.0.57 \ - crate://crates.io/thiserror-impl/1.0.57 \ + crate://crates.io/thiserror/1.0.61 \ + crate://crates.io/thiserror-impl/1.0.61 \ crate://crates.io/threadpool/1.8.1 \ crate://crates.io/tui/0.19.0 \ crate://crates.io/unicode-ident/1.0.12 \ crate://crates.io/unicode-segmentation/1.11.0 \ - crate://crates.io/unicode-width/0.1.11 \ + crate://crates.io/unicode-width/0.1.13 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ crate://crates.io/winapi/0.3.9 \ crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ crate://crates.io/windows-sys/0.52.0 \ - crate://crates.io/windows-targets/0.52.3 \ - crate://crates.io/windows_aarch64_gnullvm/0.52.3 \ - crate://crates.io/windows_aarch64_msvc/0.52.3 \ - crate://crates.io/windows_i686_gnu/0.52.3 \ - crate://crates.io/windows_i686_msvc/0.52.3 \ - crate://crates.io/windows_x86_64_gnu/0.52.3 \ - crate://crates.io/windows_x86_64_gnullvm/0.52.3 \ - crate://crates.io/windows_x86_64_msvc/0.52.3 \ + crate://crates.io/windows-targets/0.52.6 \ + crate://crates.io/windows_aarch64_gnullvm/0.52.6 \ + crate://crates.io/windows_aarch64_msvc/0.52.6 \ + crate://crates.io/windows_i686_gnu/0.52.6 \ + crate://crates.io/windows_i686_gnullvm/0.52.6 \ + crate://crates.io/windows_i686_msvc/0.52.6 \ + crate://crates.io/windows_x86_64_gnu/0.52.6 \ + crate://crates.io/windows_x86_64_gnullvm/0.52.6 \ + crate://crates.io/windows_x86_64_msvc/0.52.6 \ " SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -SRC_URI[aho-corasick-1.1.2.sha256sum] = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" -SRC_URI[anstyle-1.0.6.sha256sum] = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" -SRC_URI[anyhow-1.0.80.sha256sum] = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +SRC_URI[anstyle-1.0.7.sha256sum] = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" +SRC_URI[anyhow-1.0.86.sha256sum] = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[bitflags-2.4.2.sha256sum] = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" -SRC_URI[bytemuck-1.14.3.sha256sum] = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f" +SRC_URI[bitflags-2.6.0.sha256sum] = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +SRC_URI[bytemuck-1.16.1.sha256sum] = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e" SRC_URI[byteorder-1.5.0.sha256sum] = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" SRC_URI[cassowary-0.3.0.sha256sum] = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[clap-4.5.1.sha256sum] = "c918d541ef2913577a0f9566e9ce27cb35b6df072075769e0b26cb5a554520da" -SRC_URI[clap_builder-4.5.1.sha256sum] = "9f3e7391dad68afb0c2ede1bf619f579a3dc9c2ec67f089baa397123a2f3d1eb" -SRC_URI[clap_lex-0.7.0.sha256sum] = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" +SRC_URI[clap-4.5.9.sha256sum] = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +SRC_URI[clap_builder-4.5.9.sha256sum] = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +SRC_URI[clap_lex-0.7.1.sha256sum] = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" SRC_URI[console-0.15.8.sha256sum] = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -SRC_URI[crc32c-0.6.5.sha256sum] = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" -SRC_URI[crc32fast-1.4.0.sha256sum] = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" -SRC_URI[data-encoding-2.5.0.sha256sum] = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +SRC_URI[crc32c-0.6.8.sha256sum] = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47" +SRC_URI[crc32fast-1.4.2.sha256sum] = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" +SRC_URI[data-encoding-2.6.0.sha256sum] = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" SRC_URI[downcast-0.11.0.sha256sum] = "1435fa1053d8b2fbbe9be7e97eca7f33d37b28409959813daefc1446a14247f1" SRC_URI[duct-0.13.7.sha256sum] = "e4ab5718d1224b63252cd0c6f74f6480f9ffeb117438a2e0f5cf6d9a4798929c" SRC_URI[encode_unicode-0.3.6.sha256sum] = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" SRC_URI[env_logger-0.8.4.sha256sum] = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" -SRC_URI[errno-0.3.8.sha256sum] = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +SRC_URI[errno-0.3.9.sha256sum] = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" SRC_URI[exitcode-1.1.2.sha256sum] = "de853764b47027c2e862a995c34978ffa63c1501f2e15f987ba11bd4f9bba193" -SRC_URI[fastrand-2.0.1.sha256sum] = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +SRC_URI[fastrand-2.1.0.sha256sum] = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" SRC_URI[fixedbitset-0.4.2.sha256sum] = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" -SRC_URI[flate2-1.0.28.sha256sum] = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +SRC_URI[flate2-1.0.30.sha256sum] = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" SRC_URI[fragile-2.0.0.sha256sum] = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa" -SRC_URI[getrandom-0.2.12.sha256sum] = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -SRC_URI[hermit-abi-0.3.6.sha256sum] = "bd5256b483761cd23699d0da46cc6fd2ee3be420bbe6d020ae4a091e70b7e9fd" +SRC_URI[hermit-abi-0.3.9.sha256sum] = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" SRC_URI[indicatif-0.17.8.sha256sum] = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -SRC_URI[instant-0.1.12.sha256sum] = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +SRC_URI[instant-0.1.13.sha256sum] = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" SRC_URI[iovec-0.1.4.sha256sum] = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" -SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -SRC_URI[libc-0.2.153.sha256sum] = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" -SRC_URI[linux-raw-sys-0.4.13.sha256sum] = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" -SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" -SRC_URI[memchr-2.7.1.sha256sum] = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +SRC_URI[lazy_static-1.5.0.sha256sum] = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +SRC_URI[linux-raw-sys-0.4.14.sha256sum] = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" +SRC_URI[log-0.4.22.sha256sum] = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" SRC_URI[minimal-lexical-0.2.1.sha256sum] = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -SRC_URI[miniz_oxide-0.7.2.sha256sum] = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +SRC_URI[miniz_oxide-0.7.4.sha256sum] = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" SRC_URI[mockall-0.12.1.sha256sum] = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48" SRC_URI[mockall_derive-0.12.1.sha256sum] = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2" SRC_URI[nom-7.1.3.sha256sum] = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" SRC_URI[num-derive-0.4.2.sha256sum] = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" -SRC_URI[num-traits-0.2.18.sha256sum] = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" SRC_URI[number_prefix-0.4.0.sha256sum] = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" SRC_URI[numtoa-0.1.0.sha256sum] = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" -SRC_URI[os_pipe-1.1.5.sha256sum] = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +SRC_URI[os_pipe-1.2.0.sha256sum] = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" SRC_URI[predicates-3.1.0.sha256sum] = "68b87bfd4605926cdfefc1c3b5f8fe560e3feca9d5552cf68c466d3d8236c7e8" SRC_URI[predicates-core-1.0.6.sha256sum] = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174" SRC_URI[predicates-tree-1.0.9.sha256sum] = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf" -SRC_URI[proc-macro2-1.0.78.sha256sum] = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" -SRC_URI[quick-xml-0.31.0.sha256sum] = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +SRC_URI[quick-xml-0.36.0.sha256sum] = "4091e032efecb09d7b1f711f487b85ab925632a842627e3200fb088382cde32c" SRC_URI[quickcheck-1.0.3.sha256sum] = "588f6378e4dd99458b60ec275b4477add41ce4fa9f64dcba6f15adccb19b50d6" SRC_URI[quickcheck_macros-1.0.0.sha256sum] = "b22a693222d716a9587786f37ac3f6b4faedb5b80c23914e7303ff5a1d8016e9" -SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" SRC_URI[rand-0.8.5.sha256sum] = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" SRC_URI[rand_chacha-0.3.1.sha256sum] = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" SRC_URI[rand_core-0.6.4.sha256sum] = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -SRC_URI[rangemap-1.5.0.sha256sum] = "795915a3930a5d6bafd9053d37602fea3e61be2e5d4d788983a8ba9654c1c6f2" +SRC_URI[rangemap-1.5.1.sha256sum] = "f60fcc7d6849342eff22c4350c8b9a989ee8ceabc4b481253e8946b9fe83d684" SRC_URI[redox_syscall-0.2.16.sha256sum] = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" SRC_URI[redox_termios-0.1.3.sha256sum] = "20145670ba436b55d91fc92d25e71160fbfbdd57831631c8d7d36377a476f1cb" -SRC_URI[regex-1.10.3.sha256sum] = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" -SRC_URI[regex-automata-0.4.5.sha256sum] = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" -SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -SRC_URI[roaring-0.10.3.sha256sum] = "a1c77081a55300e016cb86f2864415b7518741879db925b8d488a0ee0d2da6bf" +SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +SRC_URI[roaring-0.10.6.sha256sum] = "8f4b84ba6e838ceb47b41de5194a60244fac43d9fe03b71dbe8c5a201081d6d1" SRC_URI[rustc_version-0.4.0.sha256sum] = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" -SRC_URI[rustix-0.38.31.sha256sum] = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +SRC_URI[rustix-0.38.34.sha256sum] = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" SRC_URI[safemem-0.3.3.sha256sum] = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" -SRC_URI[semver-1.0.22.sha256sum] = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +SRC_URI[semver-1.0.23.sha256sum] = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" SRC_URI[shared_child-1.0.0.sha256sum] = "b0d94659ad3c2137fef23ae75b03d5241d633f8acded53d672decfa0e6e0caef" -SRC_URI[strsim-0.11.0.sha256sum] = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" +SRC_URI[strsim-0.11.1.sha256sum] = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -SRC_URI[syn-2.0.50.sha256sum] = "74f1bdc9872430ce9b75da68329d1c1746faf50ffac5f19e02b71e37ff881ffb" -SRC_URI[tempfile-3.10.0.sha256sum] = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" +SRC_URI[syn-2.0.70.sha256sum] = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +SRC_URI[tempfile-3.10.1.sha256sum] = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" SRC_URI[termion-1.5.6.sha256sum] = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" SRC_URI[termtree-0.4.1.sha256sum] = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" -SRC_URI[thiserror-1.0.57.sha256sum] = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" -SRC_URI[thiserror-impl-1.0.57.sha256sum] = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +SRC_URI[thiserror-1.0.61.sha256sum] = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +SRC_URI[thiserror-impl-1.0.61.sha256sum] = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" SRC_URI[threadpool-1.8.1.sha256sum] = "d050e60b33d41c19108b32cea32164033a9013fe3b46cbd4457559bfbf77afaa" SRC_URI[tui-0.19.0.sha256sum] = "ccdd26cbd674007e649a272da4475fb666d3aa0ad0531da7136db6fab0e5bad1" SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" SRC_URI[unicode-segmentation-1.11.0.sha256sum] = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" -SRC_URI[unicode-width-0.1.11.sha256sum] = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +SRC_URI[unicode-width-0.1.13.sha256sum] = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" SRC_URI[windows-sys-0.52.0.sha256sum] = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -SRC_URI[windows-targets-0.52.3.sha256sum] = "d380ba1dc7187569a8a9e91ed34b8ccfc33123bbacb8c0aed2d1ad7f3ef2dc5f" -SRC_URI[windows_aarch64_gnullvm-0.52.3.sha256sum] = "68e5dcfb9413f53afd9c8f86e56a7b4d86d9a2fa26090ea2dc9e40fba56c6ec6" -SRC_URI[windows_aarch64_msvc-0.52.3.sha256sum] = "8dab469ebbc45798319e69eebf92308e541ce46760b49b18c6b3fe5e8965b30f" -SRC_URI[windows_i686_gnu-0.52.3.sha256sum] = "2a4e9b6a7cac734a8b4138a4e1044eac3404d8326b6c0f939276560687a033fb" -SRC_URI[windows_i686_msvc-0.52.3.sha256sum] = "28b0ec9c422ca95ff34a78755cfa6ad4a51371da2a5ace67500cf7ca5f232c58" -SRC_URI[windows_x86_64_gnu-0.52.3.sha256sum] = "704131571ba93e89d7cd43482277d6632589b18ecf4468f591fbae0a8b101614" -SRC_URI[windows_x86_64_gnullvm-0.52.3.sha256sum] = "42079295511643151e98d61c38c0acc444e52dd42ab456f7ccfd5152e8ecf21c" -SRC_URI[windows_x86_64_msvc-0.52.3.sha256sum] = "0770833d60a970638e989b3fa9fd2bb1aaadcf88963d1659fd7d9990196ed2d6" +SRC_URI[windows-targets-0.52.6.sha256sum] = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" +SRC_URI[windows_aarch64_gnullvm-0.52.6.sha256sum] = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +SRC_URI[windows_aarch64_msvc-0.52.6.sha256sum] = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +SRC_URI[windows_i686_gnu-0.52.6.sha256sum] = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +SRC_URI[windows_i686_gnullvm-0.52.6.sha256sum] = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +SRC_URI[windows_i686_msvc-0.52.6.sha256sum] = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +SRC_URI[windows_x86_64_gnu-0.52.6.sha256sum] = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +SRC_URI[windows_x86_64_gnullvm-0.52.6.sha256sum] = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +SRC_URI[windows_x86_64_msvc-0.52.6.sha256sum] = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" diff --git a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb index 09b91f6b37..1d3c797244 100644 --- a/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.12.bb +++ b/meta-openembedded/meta-oe/recipes-support/thin-provisioning-tools/thin-provisioning-tools_1.0.13.bb @@ -11,7 +11,7 @@ SRC_URI = " \ git://github.com/jthornber/thin-provisioning-tools;branch=main;protocol=https \ " -SRCREV = "b2d57dad4c3378544d7b36f3fc61e60989c5c092" +SRCREV = "116c05345bed5fe727992c3458311606d5443ff6" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>\d+(\.\d+)+)" inherit cargo cargo-update-recipe-crates @@ -34,16 +34,18 @@ do_install:append() { thin_delta \ thin_dump \ thin_ls \ - thin_repair \ - thin_restore \ - thin_rmap \ thin_metadata_size \ thin_metadata_pack \ thin_metadata_unpack \ + thin_repair \ + thin_restore \ + thin_rmap \ + thin_shrink \ thin_trim \ era_check \ era_dump \ era_invalidate \ + era_repair \ era_restore; do ln -sf pdata_tools ${D}${sbindir}/$tool done diff --git a/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.1.bb b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.3.bb index 0b61149609..79e0d5e10b 100644 --- a/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.1.bb +++ b/meta-openembedded/meta-oe/recipes-support/tree/tree_2.1.3.bb @@ -1,11 +1,11 @@ SUMMARY = "A recursive directory listing command" -HOMEPAGE = "http://mama.indstate.edu/users/ice/tree/" +HOMEPAGE = "https://oldmanprogrammer.net/source.php?dir=projects/tree" SECTION = "console/utils" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=393a5ca445f6965873eca0259a17f833" -SRC_URI = "http://mama.indstate.edu/users/ice/tree/src/${BP}.tgz" -SRC_URI[sha256sum] = "d3c3d55f403af7c76556546325aa1eca90b918cbaaf6d3ab60a49d8367ab90d5" +SRC_URI = "https://oldmanprogrammer.net/tar/tree/${BP}.tgz" +SRC_URI[sha256sum] = "c24c9bfbbb3bd31a43b16898f74fd338cfcf348e914de81438ddfcf052076ff4" # tree's default CFLAGS for Linux CFLAGS += "-Wall -DLINUX -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" diff --git a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb index 8b334dbdec..1a1d4ec33c 100644 --- a/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.5.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/uhubctl/uhubctl_2.6.0.bb @@ -6,7 +6,7 @@ DEPENDS = "libusb1" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -SRCREV = "20276ad5ced147d018e2b3fccedabd94597aa25e" +SRCREV = "352f5878e999c0a9d5a453b34110479b2056d7e7" SRC_URI = "git://github.com/mvp/${BPN};branch=master;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.9.bb b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.9.bb index f78c82f18a..9d2068c6d6 100644 --- a/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/uim/uim_1.8.9.bb @@ -11,6 +11,7 @@ SRC_URI:append:class-target = "\ SRC_URI[sha256sum] = "dbbd983768bf748449551644f330dbebe859bfeb6f024fea6697ac75131c7aa4" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" DEPENDS = "anthy fontconfig libxft libxt glib-2.0 ncurses intltool libedit" DEPENDS:append:class-target = " intltool-native gtk+ gtk+3 uim-native" diff --git a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb index dfad833e0a..0927f5c904 100644 --- a/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb +++ b/meta-openembedded/meta-oe/recipes-support/unixodbc/unixodbc_2.3.12.bb @@ -15,6 +15,7 @@ SRC_URI = "https://www.unixodbc.org/unixODBC-${PV}.tar.gz \ " SRC_URI[sha256sum] = "f210501445ce21bf607ba51ef8c125e10e22dffdffec377646462df5f01915ec" +UPSTREAM_CHECK_URI = "https://www.unixodbc.org/download.html" UPSTREAM_CHECK_REGEX = "unixODBC-(?P<pver>\d+(\.\d+)+)\.tar" inherit autotools-brokensep multilib_header qemu diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb index 47f616e990..444b86a1b2 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.18.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_7.0.20.bb @@ -1,7 +1,7 @@ SUMMARY = "VirtualBox Linux Guest Drivers" SECTION = "core" LICENSE = "GPL-3.0-only" -LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=fff5fe1c81dd6dc3d522e7862e44881e" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/${VBOX_NAME}/COPYING;md5=217590d3a513571b94632edf5fa1169a" DEPENDS = "virtual/kernel" @@ -15,7 +15,7 @@ SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 file://Makefile.utils \ " -SRC_URI[sha256sum] = "d999513533631674a024762668de999411d8197060c51e68c5faf0a2c0eea1a5" +SRC_URI[sha256sum] = "5cf5979bef66ebab3fcd495796b215a940e8a07c469d4bc56d064de44222dd02" S ?= "${WORKDIR}/vbox_module" S:task-patch = "${WORKDIR}/${VBOX_NAME}" diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch new file mode 100644 index 0000000000..6ef9835c2c --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/0001-Fix-build-issues-with-latest-Clang.patch @@ -0,0 +1,237 @@ +From 257ed304fb3e71d412568dcbed7129c145812fdf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Sep 2024 21:38:12 -0700 +Subject: [PATCH] Fix build issues with latest Clang + https://bugs.webkit.org/show_bug.cgi?id=276198 rdar://130933637 + +Reviewed by Yusuke Suzuki. + +The use of the template keyword to reference template members without a template argument list was deprecated in the C++ standard. +e.g. `foo.template bar()` nows needs to be `foo.template bar<>()`. I ran into a different issue with `std::reference_wrapper` that +blocked me from going any further, which AFAICT is a bug on the Clang side. + +This also fixes a few other warnings that popped up while building with the new Clang denoted inline + +* Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp: +(JSC::FTL::DFG::LowerDFGToB3::compileCompareStrictEq): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. +* Source/JavaScriptCore/jit/AssemblyHelpers.cpp: +(JSC::AssemblyHelpers::emitNonNullDecodeZeroExtendedStructureID): Clang didn't like the implicit static_cast<int32_t>(UINT32_MAX) so make it explicit with a static_assert no data was lost. +* Source/JavaScriptCore/llint/InPlaceInterpreter.cpp: +* Source/JavaScriptCore/llint/LLIntData.h: +(JSC::LLInt::getCodeFunctionPtr): +(JSC::LLInt::getWide16CodeFunctionPtr): +(JSC::LLInt::getWide32CodeFunctionPtr): +* Source/JavaScriptCore/parser/Nodes.h: Missing definition of ModuleScopeData added include. +* Source/JavaScriptCore/runtime/JSCast.h: +(JSC::JSCastingHelpers::inherits): +(JSC::jsDynamicCast): +* Source/ThirdParty/libwebrtc/Source/third_party/boringssl/src/crypto/bio/connect.c: +(conn_callback_ctrl): Had a warning about an incompatible function type. Seems like this is intentional suppressed the warning. +* Source/WTF/wtf/cf/TypeCastsCF.h: Had a warning about extra namespace qualification. I just moved it out of the namespace. That said, it feels like this warning shouldn't apply to macro expansions... +* Source/WebCore/PAL/ThirdParty/libavif/ThirdParty/dav1d/src/decode.c: +(decode_b): Had a warning about different types on the middle/right of a ternary expression. I just pushed the comparison inside the ternary. + +Canonical link: https://commits.webkit.org/280700@main + +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/62b6e2db547e#diff-136d848d7c1b400da9b486916b67592b54e5abf7c66ac247697a93ae2fb743a9] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp | 6 ++++-- + Source/JavaScriptCore/jit/AssemblyHelpers.cpp | 6 ++++-- + .../JavaScriptCore/llint/InPlaceInterpreter.cpp | 16 ++++++++-------- + Source/JavaScriptCore/llint/LLIntData.h | 12 ++++++------ + Source/JavaScriptCore/llint/LLIntThunks.cpp | 2 +- + Source/JavaScriptCore/parser/Nodes.h | 4 ++-- + Source/JavaScriptCore/runtime/JSCast.h | 4 ++-- + 7 files changed, 27 insertions(+), 23 deletions(-) + +--- a/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp ++++ b/Source/JavaScriptCore/ftl/FTLLowerDFGToB3.cpp +@@ -22930,8 +22930,10 @@ IGNORE_CLANG_WARNINGS_END + return m_out.shl(m_out.zeroExtPtr(structureID), m_out.constIntPtr(StructureID::encodeShiftAmount)); + #else + LValue maskedStructureID = structureID; +- if constexpr (structureHeapAddressSize < 4 * GB) +- maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(StructureID::structureIDMask)); ++ if constexpr (structureHeapAddressSize < 4 * GB) { ++ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); ++ maskedStructureID = m_out.bitAnd(structureID, m_out.constInt32(static_cast<uint32_t>(StructureID::structureIDMask))); ++ } + return m_out.bitOr(m_out.constIntPtr(startOfStructureHeap()), m_out.zeroExtPtr(maskedStructureID)); + #endif + } +--- a/Source/JavaScriptCore/jit/AssemblyHelpers.cpp ++++ b/Source/JavaScriptCore/jit/AssemblyHelpers.cpp +@@ -677,8 +677,10 @@ void AssemblyHelpers::emitNonNullDecodeZ + if constexpr (structureHeapAddressSize >= 4 * GB) { + ASSERT(structureHeapAddressSize == 4 * GB); + move(source, dest); +- } else +- and32(TrustedImm32(StructureID::structureIDMask), source, dest); ++ } else { ++ static_assert(static_cast<uint32_t>(StructureID::structureIDMask) == StructureID::structureIDMask); ++ and32(TrustedImm32(static_cast<uint32_t>(StructureID::structureIDMask)), source, dest); ++ } + or64(TrustedImm64(startOfStructureHeap()), dest); + #else // not CPU(ADDRESS64) + move(source, dest); +--- a/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp ++++ b/Source/JavaScriptCore/llint/InPlaceInterpreter.cpp +@@ -43,8 +43,8 @@ namespace JSC { namespace IPInt { + do { \ + void* base = reinterpret_cast<void*>(ipint_unreachable_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -52,8 +52,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_i32_trunc_sat_f32_s_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -61,8 +61,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_simd_v128_load_mem_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +@@ -70,8 +70,8 @@ do { \ + do { \ + void* base = reinterpret_cast<void*>(ipint_memory_atomic_notify_validate); \ + void* ptr = reinterpret_cast<void*>(ipint_ ## name ## _validate); \ +- void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr(); \ +- void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); \ ++ void* untaggedBase = CodePtr<CFunctionPtrTag>::fromTaggedPtr(base).template untaggedPtr<>(); \ ++ void* untaggedPtr = CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); \ + RELEASE_ASSERT_WITH_MESSAGE((char*)(untaggedPtr) - (char*)(untaggedBase) == opcode * 256, #name); \ + } while (false); + +--- a/Source/JavaScriptCore/llint/LLIntData.h ++++ b/Source/JavaScriptCore/llint/LLIntData.h +@@ -217,7 +217,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -227,7 +227,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -237,7 +237,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + #else // not ENABLE(JIT) +@@ -361,7 +361,7 @@ ALWAYS_INLINE LLIntCode getCodeFunctionP + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getCodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -371,7 +371,7 @@ ALWAYS_INLINE LLIntCode getWide16CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide16CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + +@@ -381,7 +381,7 @@ ALWAYS_INLINE LLIntCode getWide32CodeFun + #if COMPILER(MSVC) + return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).taggedPtr()); + #else +- return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr()); ++ return reinterpret_cast<LLIntCode>(getWide32CodePtr<tag>(opcodeID).template taggedPtr<>()); + #endif + } + #else // not ENABLE(JIT) +--- a/Source/JavaScriptCore/llint/LLIntThunks.cpp ++++ b/Source/JavaScriptCore/llint/LLIntThunks.cpp +@@ -227,7 +227,7 @@ ALWAYS_INLINE void* untaggedPtr(void* pt + #if COMPILER(MSVC) + return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).untaggedPtr(); + #else +- return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr(); ++ return CodePtr<CFunctionPtrTag>::fromTaggedPtr(ptr).template untaggedPtr<>(); + #endif + } + +--- a/Source/JavaScriptCore/parser/Nodes.h ++++ b/Source/JavaScriptCore/parser/Nodes.h +@@ -1,7 +1,7 @@ + /* + * Copyright (C) 1999-2000 Harri Porten (porten@kde.org) + * Copyright (C) 2001 Peter Kelly (pmk@post.com) +- * Copyright (C) 2003-2019 Apple Inc. All rights reserved. ++ * Copyright (C) 2003-2024 Apple Inc. All rights reserved. + * Copyright (C) 2007 Cameron Zwarich (cwzwarich@uwaterloo.ca) + * Copyright (C) 2007 Maks Orlovich + * Copyright (C) 2007 Eric Seidel <eric@webkit.org> +@@ -29,6 +29,7 @@ + #include "ImplementationVisibility.h" + #include "JITCode.h" + #include "Label.h" ++#include "ModuleScopeData.h" + #include "ParserArena.h" + #include "ParserModes.h" + #include "ParserTokens.h" +@@ -49,7 +50,6 @@ namespace JSC { + class FunctionMetadataNode; + class FunctionParameters; + class ModuleAnalyzer; +- class ModuleScopeData; + class PropertyListNode; + class ReadModifyResolveNode; + class RegisterID; +--- a/Source/JavaScriptCore/runtime/JSCast.h ++++ b/Source/JavaScriptCore/runtime/JSCast.h +@@ -236,7 +236,7 @@ template<typename Target, typename From> + bool inherits(From* from) + { + using Dispatcher = InheritsTraits<Target>; +- return Dispatcher::template inherits(from); ++ return Dispatcher::template inherits<>(from); + } + + } // namespace JSCastingHelpers +@@ -245,7 +245,7 @@ template<typename To, typename From> + To jsDynamicCast(From* from) + { + using Dispatcher = JSCastingHelpers::InheritsTraits<typename std::remove_cv<typename std::remove_pointer<To>::type>::type>; +- if (LIKELY(Dispatcher::template inherits(from))) ++ if (LIKELY(Dispatcher::template inherits<>(from))) + return static_cast<To>(from); + return nullptr; + } diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch new file mode 100644 index 0000000000..3d76aa4e4d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3/fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch @@ -0,0 +1,33 @@ +From fff1b1773bff2ef7c3b867ab019d69faa36c010d Mon Sep 17 00:00:00 2001 +From: Michael Catanzaro <mcatanzaro@redhat.com> +Date: Wed, 3 Jul 2024 13:36:54 -0700 +Subject: [PATCH] WebKitDOMEventTarget.h:95: Warning: WebKit2WebExtension: + invalid "scope" annotation: only valid on callback parameters + https://bugs.webkit.org/show_bug.cgi?id=276180 + +Unreviewed build fix. + +Emmanuele recommends using (type gpointer) for the GCallback parameter +of webkit_dom_event_target_remove_event_listener, since it won't be +called and is therefore not functioning as a callback. + +* Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h: + +Canonical link: https://commits.webkit.org/280639@main +Upstream-Status: Backport [https://github.com/WebKit/WebKit/commit/fff1b1773bff2ef7c3b867ab019d69faa36c010d] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + .../InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h ++++ b/Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/WebKitDOMEventTarget.h +@@ -92,7 +92,7 @@ WEBKIT_DEPRECATED gboolean webkit_dom_e + * webkit_dom_event_target_remove_event_listener: + * @target: A #WebKitDOMEventTarget + * @event_name: A #gchar +- * @handler: (scope call): A #GCallback ++ * @handler: (type gpointer): A #GCallback + * @use_capture: A #gboolean + * + * Returns: a #gboolean diff --git a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb index 31480b8d8e..01eefe13de 100644 --- a/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.2.bb +++ b/meta-openembedded/meta-oe/recipes-support/webkitgtk/webkitgtk3_2.44.3.bb @@ -15,8 +15,10 @@ SRC_URI = "https://www.webkitgtk.org/releases/webkitgtk-${PV}.tar.xz \ file://no-musttail-arm.patch \ file://0001-LowLevelInterpreter.cpp-339-21-error-t6-was-not-decl.patch \ file://30e1d5e22213fdaca2a29ec3400c927d710a37a8.patch \ + file://0001-Fix-build-issues-with-latest-Clang.patch \ + file://fff1b1773bff2ef7c3b867ab019d69faa36c010d.patch \ " -SRC_URI[sha256sum] = "523f42c8ff24832add17631f6eaafe8f9303afe316ef1a7e1844b952a7f7521b" +SRC_URI[sha256sum] = "dc82d042ecaca981a4852357c06e5235743319cf10a94cd36ad41b97883a0b54" inherit cmake pkgconfig gobject-introspection perlnative features_check upstream-version-is-even gi-docgen @@ -92,9 +94,8 @@ EXTRA_OECMAKE = " \ -DENABLE_MINIBROWSER=ON \ -DCMAKE_EXPORT_COMPILE_COMMANDS=OFF \ " -# Unless DEBUG_BUILD is enabled, pass -g1 to massively reduce the size of the -# debug symbols (4.3GB to 700M at time of writing) -DEBUG_FLAGS:append = "${@oe.utils.vartrue('DEBUG_BUILD', '', ' -g1', d)}" +# pass -g1 to massively reduce the size of the debug symbols (4.3GB to 700M at time of writing) +DEBUG_LEVELFLAG = "-g1" # Javascript JIT is not supported on ARC EXTRA_OECMAKE:append:arc = " -DENABLE_JIT=OFF " diff --git a/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb b/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb index e10ccd04ea..fa63196da2 100644 --- a/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.5.bb +++ b/meta-openembedded/meta-oe/recipes-support/xdg-dbus-proxy/xdg-dbus-proxy_0.1.6.bb @@ -14,6 +14,6 @@ inherit meson pkgconfig SRC_URI = "git://github.com/flatpak/xdg-dbus-proxy.git;protocol=https;branch=main" S = "${WORKDIR}/git" -SRCREV = "7466c8137fc06f863fde8486521984e43a26cd10" +SRCREV = "1c1989e56f94b9eb3b7567f8a6e8a0aa16cba496" BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch index f107f42dab..697a8ee355 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/0001-nss-nspr-fix-for-multilib.patch @@ -1,4 +1,4 @@ -From 4d73b85fb1b794c649359bc8a774b0111d36994a Mon Sep 17 00:00:00 2001 +From 1d7c01467e6f510b5636c73757f302a4bd277a3c Mon Sep 17 00:00:00 2001 From: Chen Qi <Qi.Chen@windriver.com> Date: Tue, 4 Feb 2020 23:39:49 -0800 Subject: [PATCH] nss/nspr: fix for multilib @@ -6,16 +6,15 @@ Subject: [PATCH] nss/nspr: fix for multilib Upstream-Status: Pending Signed-off-by: Chen Qi <Qi.Chen@windriver.com> - --- configure.ac | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac -index 51621d6..3d23683 100644 +index 7f137c0..e15f5bc 100644 --- a/configure.ac +++ b/configure.ac -@@ -960,24 +960,24 @@ fi +@@ -958,24 +958,24 @@ fi dnl Priority 1: User specifies the path to installation if test "z$NSPR_FOUND" = "zno" -a "z$with_nspr" != "z" -a "z$with_nspr" != "zyes" ; then AC_MSG_CHECKING(for nspr library installation in "$with_nspr" folder) diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch index 3a1531deb1..61c56ffc8b 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1/change-finding-path-of-nss.patch @@ -1,4 +1,4 @@ -From 9c861646e034b1c80fafd389279b0a7da90a8ba7 Mon Sep 17 00:00:00 2001 +From b43fa6bf612ee59db57573b39e357b6ca96d48b6 Mon Sep 17 00:00:00 2001 From: Yulong Pei <Yulong.pei@windriver.com> Date: Wed, 21 Jul 2010 22:33:43 +0800 Subject: [PATCH] change finding path of nss and nspr @@ -8,16 +8,15 @@ Upstream-Status: Pending Signed-off-by: Yulong Pei <Yulong.pei@windriver.com> Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> Signed-off-by: Yi Zhao <yi.zhao@windriver.com> - --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index ce8a278..51621d6 100644 +index 8add879..7f137c0 100644 --- a/configure.ac +++ b/configure.ac -@@ -935,7 +935,7 @@ NSS_PACKAGE=mozilla-nss +@@ -933,7 +933,7 @@ NSS_PACKAGE=mozilla-nss NSPR_INCLUDE_MARKER="nspr/nspr.h" NSPR_LIB_MARKER="libnspr4$shrext" NSPR_LIBS_LIST="-lnspr4 -lplds4 -lplc4" diff --git a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb index 7639209e19..50c387d250 100644 --- a/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.4.bb +++ b/meta-openembedded/meta-oe/recipes-support/xmlsec1/xmlsec1_1.3.5.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=352791d62092ea8104f085042de7f4d0" SECTION = "libs" -SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ +SRC_URI = "https://github.com/lsh123/xmlsec/releases/download/${PR}/${BP}.tar.gz \ file://fix-ltmain.sh.patch \ file://change-finding-path-of-nss.patch \ file://makefile-ptest.patch \ @@ -22,7 +22,7 @@ SRC_URI = "http://www.aleksey.com/xmlsec/download/${BP}.tar.gz \ file://ensure-search-path-non-host.patch \ " -SRC_URI[sha256sum] = "45ad9078d41ae76844ad2f8651600ffeec0fdd128ead988a8d69e907c57aee75" +SRC_URI[sha256sum] = "2ffd4ad1f860ec93e47a680310ab2bc94968bd07566e71976bd96133d9504917" inherit autotools-brokensep ptest pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb index c1b75e6138..7c85697d4f 100644 --- a/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb +++ b/meta-openembedded/meta-oe/recipes-support/xrdp/xrdp_0.9.19.bb @@ -20,6 +20,9 @@ SRC_URI = "https://github.com/neutrinolabs/${BPN}/releases/download/v${PV}/${BPN SRC_URI[sha256sum] = "94017d30e475c6d7a24f651e16791551862ae46f82d8de62385e63393f5f93d0" +UPSTREAM_CHECK_URI = "https://github.com/neutrinolabs/xrdp/releases" +UPSTREAM_CHECK_REGEX = "releases/tag/v(?P<pver>\d+(\.\d+)+)" + CFLAGS += " -Wno-deprecated-declarations" PACKAGECONFIG ??= "" diff --git a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_3.6.0.bb b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_3.7.0.bb index c4541c4d52..2d571a9cfc 100644 --- a/meta-openembedded/meta-oe/recipes-test/catch2/catch2_3.6.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/catch2/catch2_3.7.0.bb @@ -5,7 +5,7 @@ LICENSE = "BSL-1.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" SRC_URI = "git://github.com/catchorg/Catch2.git;branch=devel;protocol=https" -SRCREV = "4e8d92bf02f7d1c8006a0e7a5ecabd8e62d98502" +SRCREV = "31588bb4f56b638dd5afc28d3ebff9b9dcefb88d" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb index c5dfff2259..8c8fb60985 100644 --- a/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb +++ b/meta-openembedded/meta-oe/recipes-test/cxxtest/cxxtest_4.4.bb @@ -8,6 +8,8 @@ SRC_URI = "http://downloads.sourceforge.net/project/cxxtest/cxxtest/${PV}/${BP}. SRC_URI[md5sum] = "c3cc3355e2ac64e34c215f28e44cfcec" SRC_URI[sha256sum] = "1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8" +UPSTREAM_CHECK_URI = "https://sourceforge.net/p/cxxtest/activity/" + inherit setuptools3 SETUPTOOLS_SETUP_PATH = "${S}/python" diff --git a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb index 6082ea2574..b19bba0156 100644 --- a/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/fbtest/fb-test_1.1.0.bb @@ -6,6 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a" SRCREV = "063ec650960c2d79ac51f5c5f026cb05343a33e2" SRC_URI = "git://github.com//ponty/fb-test-app.git;branch=master;protocol=https" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" do_install() { diff --git a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.15.2.bb index 6546845715..bc479268ba 100644 --- a/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.14.0.bb +++ b/meta-openembedded/meta-oe/recipes-test/googletest/googletest_1.15.2.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cbbd27594afd089daa160d3a16dd515a" PROVIDES += "gmock gtest" S = "${WORKDIR}/git" -SRCREV = "f8d7d77c06936315286eb55f8de22cd23c188571" -SRC_URI = "git://github.com/google/googletest.git;branch=main;protocol=https" +SRCREV = "b514bdc898e2951020cbdca1304b75f5950d1f59" +SRC_URI = "git://github.com/google/googletest.git;branch=v1.15.x;protocol=https" inherit cmake pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb index e909676abc..7346011158 100644 --- a/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/linux-serial-test/linux-serial-test_git.bb @@ -8,6 +8,9 @@ SRC_URI = "git://github.com/cbrake/linux-serial-test.git;protocol=https;branch=m PV = "0+git" SRCREV = "2ee61484167eab846f7b7c565284d7c350d738d3" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + S = "${WORKDIR}/git" inherit cmake diff --git a/meta-openembedded/meta-oe/recipes-test/syzkaller/syzkaller_git.bb b/meta-openembedded/meta-oe/recipes-test/syzkaller/syzkaller_git.bb index 639f55de2f..4043ab7ea5 100644 --- a/meta-openembedded/meta-oe/recipes-test/syzkaller/syzkaller_git.bb +++ b/meta-openembedded/meta-oe/recipes-test/syzkaller/syzkaller_git.bb @@ -13,6 +13,9 @@ SRC_URI = "git://${GO_IMPORT};protocol=https;destsuffix=${BPN}-${PV}/src/${GO_IM " SRCREV = "25905f5d0a2a7883bd33491997556193582c6059" +# Upstream repo does not tag +UPSTREAM_CHECK_COMMITS = "1" + export GOPROXY = "https://proxy.golang.org,direct" # Workaround for network access issue during compile step. # This needs to be fixed in the recipes buildsystem so that diff --git a/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3e.bb b/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3e.bb index 071be2a200..f5aace4d33 100644 --- a/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3e.bb +++ b/meta-openembedded/meta-oe/recipes-test/testfloat/testfloat_3e.bb @@ -19,6 +19,8 @@ SRC_URI[TestFloat.sha256sum] = "6d4bdf0096b48a653aa59fc203a9e5fe18b5a58d7a1b7151 SRC_URI[SoftFloat.md5sum] = "7dac954ea4aed0697cbfee800ba4f492" SRC_URI[SoftFloat.sha256sum] = "21130ce885d35c1fe73fc1e1bf2244178167e05c6747cad5f450cc991714c746" +UPSTREAM_CHECK_URI = "http://www.jhauser.us/arithmetic/TestFloat.html" + S = "${WORKDIR}/sources" UNPACKDIR = "${S}" diff --git a/meta-openembedded/meta-perl/README.md b/meta-openembedded/meta-perl/README.md index 13014b0ff3..f60f37322f 100644 --- a/meta-openembedded/meta-perl/README.md +++ b/meta-openembedded/meta-perl/README.md @@ -52,7 +52,7 @@ Dependencies This layer depends on: URI: git://git.openembedded.org/openembedded-core - branch: master + branch: styhead Adding the meta-perl layer to your build --------------------------------------- @@ -73,14 +73,13 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org with -'[meta-perl]' in the subject. +'[meta-perl][styhead]' in the subject. When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-perl][styhead][PATCH' -Layer maintainers: - Hongxu Jia <hongxu.jia@windriver.com> - Tim "moto-timo" Orling <ticotimo@gmail.com> +Layer maintainers: Armin Kuster <akuster808@gmail.com> + License ------- diff --git a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb index 7b67cd8625..94fb4393c2 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.64.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcgi/libcgi-perl_4.66.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=415fc49abed2728f9480cd32c8d67beb" SRC_URI = "http://search.cpan.org/CPAN/authors/id/L/LE/LEEJO/CGI-${PV}.tar.gz" -SRC_URI[sha256sum] = "39bd8e40ce00cdab39e0a2bc71abd2bbe451d1d97bc7e54e41a2e199eb6226e7" +SRC_URI[sha256sum] = "4697437688a193e3f02556e1d223015590c1f2800b40becf83dc12d5cc5ed8e1" S = "${WORKDIR}/CGI-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.213.bb index 7120730416..63706d8f74 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.212.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-bzip2-perl_2.213.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=cd551ef796cc7fa3435 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Bzip2-${PV}.tar.gz" -SRC_URI[sha256sum] = "6caeee843c428f45fa9646ea98dc675470db63dbac0ee3e2d8e9ee4eb58a856d" +SRC_URI[sha256sum] = "8d75d3d366c9101ca18061b00d438d3da39478c06159147dea3c666770577c7b" DEPENDS += "bzip2" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.213.bb index c4cba470bd..62521dfe85 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.212.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-lzma-perl_2.213.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf8828958 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "4ba7ab803bdba2d7be7d55d4a2668369d794eb8d8d6bb0db6b74fd9b4ce18cac" +SRC_URI[sha256sum] = "6b979a8347701ced3ac26123d428c1f202b7999850444da19c4aedbb7c862cb7" DEPENDS += "xz" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.213.bb index d79a710a77..b8afcc2074 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.212.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcompress/libcompress-raw-zlib-perl_2.213.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=17;md5=1bb3479faca6bb2086c SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/Compress-Raw-Zlib-${PV}.tar.gz" -SRC_URI[sha256sum] = "6d9de0c11921fd520dfd99a3f6b0ca9f1fd9850274f8bec10bbaa4f6803cc049" +SRC_URI[sha256sum] = "56b21c99cb3a3a7f7876a74dd05daa3f41fc9143ddd4dc98f8e46710a106af45" DEPENDS += "zlib" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.16.bb b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb index dc2075d134..c15d417130 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.16.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcrypt/libcrypt-openssl-random-perl_0.17.bb @@ -2,10 +2,10 @@ SUMMARY = "Crypt::OpenSSL::Random - OpenSSL/LibreSSL pseudo-random number genera SECTION = "libs" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=089c18d635ae273e1727ec385e64063b" +LIC_FILES_CHKSUM = "file://LICENSE;md5=9e876d4149406d88b4ff1b37645363ad" SRC_URI = "http://www.cpan.org/modules/by-module/Crypt/Crypt-OpenSSL-Random-${PV}.tar.gz " -SRC_URI[sha256sum] = "fcf58cb2af4c3eda2fe1405527d9373efe9576268fce8adb34df9ce9b6b44d1e" +SRC_URI[sha256sum] = "a571b24181baaa76c96704e92acffc6934ff593e380dade274db4e43c140ad51" S = "${WORKDIR}/Crypt-OpenSSL-Random-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch index ab5af3fa8c..37c81d9b8f 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch +++ b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl/0001-testtyp.c-Use-proper-prototype-for-main-function.patch @@ -17,24 +17,22 @@ int Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- - testtyp.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) + testtyp.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testtyp.c b/testtyp.c -index 949c3d4..4042f73 100644 +index 469cc48..6a48a77 100644 --- a/testtyp.c +++ b/testtyp.c -@@ -7,7 +7,8 @@ - #define _XOPEN_SOURCE_EXTENDED 1 /* We expect wide character functions */ - +@@ -10,6 +10,7 @@ #include "c-config.h" -- + + int -main() { -+int +main(int argc, char *argv[]) { typedef SYM c_sym_t; + return 0; } -- -2.37.3 +2.34.1 diff --git a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.41.bb b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb index 421823d9cd..7951e0ddbd 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.41.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libcurses/libcurses-perl_1.45.bb @@ -12,7 +12,7 @@ SRC_URI = "http://www.cpan.org/authors/id/G/GI/GIRAFFED/Curses-${PV}.tar.gz \ file://0001-testtyp.c-Use-proper-prototype-for-main-function.patch \ " -SRC_URI[sha256sum] = "fb9efea8c7b5ed5f8ea5dee49d35252accfc05ee6e75cb9a37ab7c847cd261d7" +SRC_URI[sha256sum] = "84221e0013a2d64a0bae6a32bb44b1ae5734d2cb0465fb89af3e3abd6e05aeb2" S = "${WORKDIR}/Curses-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb index 8534822e62..3ee9df7302 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.026.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libextutils/libextutils-helpers-perl_0.028.bb @@ -5,11 +5,10 @@ SECTION = "libs" HOMEPAGE = "http://search.cpan.org/~leont/ExtUtils-Helpers/" LICENSE = "Artistic-1.0 | GPL-1.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE;md5=223c04045664f72c3a6556462612bddd" +LIC_FILES_CHKSUM = "file://LICENSE;md5=c0280160e4f26faafef507664884bf63" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/ExtUtils-Helpers-${PV}.tar.gz" -SRC_URI[md5sum] = "83b00c1e401321c425ae5db6b2b2fd12" -SRC_URI[sha256sum] = "de901b6790a4557cf4ec908149e035783b125bf115eb9640feb1bc1c24c33416" +SRC_URI[sha256sum] = "c8574875cce073e7dc5345a7b06d502e52044d68894f9160203fcaab379514fe" S = "${WORKDIR}/ExtUtils-Helpers-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.213.bb index cf5a9db666..f6733ad02d 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.212.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-lzma-perl_2.213.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=2a0fd6d30eaf8828958 SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-Lzma-${PV}.tar.gz" -SRC_URI[sha256sum] = "51ef81f931cfd2c13fb2340c665204a9587843087dec1a57e9e9f4666d6dad40" +SRC_URI[sha256sum] = "daa63c3fa1f7708aa55b97a4d189820f5e849f8e4583dc24b5cceebd06a493eb" S = "${WORKDIR}/IO-Compress-Lzma-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-perl_2.213.bb index ca04ffc8ef..4e0a0be4f0 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-perl_2.212.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-compress-perl_2.213.bb @@ -18,7 +18,7 @@ LIC_FILES_CHKSUM = "file://README;beginline=8;endline=10;md5=254a3b5756814db98ee SRC_URI = "${CPAN_MIRROR}/authors/id/P/PM/PMQS/IO-Compress-${PV}.tar.gz" -SRC_URI[sha256sum] = "687490dbf9c4be42c22a945c4601812be5f4d38a9836018148915ba9e0ea65b1" +SRC_URI[sha256sum] = "ae4d01ae574e4568c5f2fb0573e74631e2720b71ad3bc5a3ffe9480f1cb9a851" S = "${WORKDIR}/IO-Compress-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb index f7b3d416df..e745cecaf5 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.085.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libio/libio-socket-ssl-perl_2.089.bb @@ -21,7 +21,7 @@ RDEPENDS:${PN} += "\ " SRC_URI = "${CPAN_MIRROR}/authors/id/S/SU/SULLR/IO-Socket-SSL-${PV}.tar.gz" -SRC_URI[sha256sum] = "95b2f7c0628a7e246a159665fbf0620d0d7835e3a940f22d3fdd47c3aa799c2e" +SRC_URI[sha256sum] = "f683112c1642967e9149f51ad553eccd017833b2f22eb23a9055609d2e3a14d1" S = "${WORKDIR}/IO-Socket-SSL-${PV}" diff --git a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb index 21f5b7f576..18ba6336f3 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.45.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libnet/libnet-dns-perl_1.46.bb @@ -9,7 +9,7 @@ DEPENDS += "perl" SRC_URI = "http://search.cpan.org/CPAN/authors/id/N/NL/NLNETLABS/Net-DNS-${PV}.tar.gz" -SRC_URI[sha256sum] = "39f4b82ffe822f4d28691f6c4260f6f1fe6b5a09b546b56dd2410c21b38c1380" +SRC_URI[sha256sum] = "91b65cd0f12461802c61ca5474f87b3e29f5182d2e1b3a2ea70702a3efb4a743" UPSTREAM_CHECK_REGEX = "Net\-DNS\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.48.bb b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.50.bb index b14fc95f1c..24b6806bc6 100644 --- a/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.48.bb +++ b/meta-openembedded/meta-perl/recipes-perl/libtest/libtest-harness-perl_3.50.bb @@ -26,7 +26,7 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://README;beginline=29;endline=30;md5=d41d8cd98f00b204e9800998ecf8427e" SRC_URI = "${CPAN_MIRROR}/authors/id/L/LE/LEONT/Test-Harness-${PV}.tar.gz" -SRC_URI[sha256sum] = "e73ff89c81c1a53f6baeef6816841b89d3384403ad97422a7da9d1eeb20ef9c5" +SRC_URI[sha256sum] = "79b6acdc444f1924cd4c2e9ed868bdc6e09580021aca8ff078ede2ffef8a6f54" UPSTREAM_CHECK_REGEX = "Test\-Harness\-(?P<pver>(\d+\.\d+))(?!_\d+).tar" diff --git a/meta-openembedded/meta-python/README.md b/meta-openembedded/meta-python/README.md index 36c193957c..18efb17b85 100644 --- a/meta-openembedded/meta-python/README.md +++ b/meta-openembedded/meta-python/README.md @@ -13,11 +13,11 @@ The meta-python layer depends on: URI: git://git.openembedded.org/openembedded-core layers: meta - branch: master + branch: styhead URI: git://git.openembedded.org/meta-openembedded layers: meta-oe - branch: master + branch: styhead Contributing ------------------------- @@ -28,14 +28,12 @@ comments and patch review. It is subscriber only, so please register before posting. Send pull requests to openembedded-devel@lists.openembedded.org with -'[meta-python]' in the subject. +'[meta-python][styhead]' in the subject. When sending single patches, please use something like: -git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][PATCH' +git send-email -M -1 --to=openembedded-devel@lists.openembedded.org --subject-prefix='meta-python][styhead][PATCH' Maintenance ------------------------- -Layer maintainers: - Tim "moto-timo" Orling <TicoTimo@gmail.com> - Derek Straka <derek@asterius.io> +Layer maintainers: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-python/conf/include/non-repro-meta-python.inc b/meta-openembedded/meta-python/conf/include/non-repro-meta-python.inc index 629dc4aa04..64dc69ed55 100755 --- a/meta-openembedded/meta-python/conf/include/non-repro-meta-python.inc +++ b/meta-openembedded/meta-python/conf/include/non-repro-meta-python.inc @@ -1,6 +1,8 @@ # List of known non-reproducible package of the meta-python layer # Please keep this list sorted KNOWN_NON_REPRO_META_PYTHON = " \ + python3-evdev \ + python3-evdev-dbg \ python3-evdev-src \ python3-frozenlist \ python3-frozenlist-dbg \ @@ -8,6 +10,7 @@ KNOWN_NON_REPRO_META_PYTHON = " \ python3-pandas \ python3-pandas-dbg \ python3-pandas-src \ + python3-pybind11-json-dev \ python3-pycocotools-src \ python3-pydantic-core \ python3-pynacl \ diff --git a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc index 56a5cf2f09..92e64908b1 100644 --- a/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc +++ b/meta-openembedded/meta-python/conf/include/ptest-packagelists-meta-python.inc @@ -24,6 +24,7 @@ PTESTS_FAST_META_PYTHON = "\ python3-flexcache \ python3-flexparser \ python3-freezegun \ + python3-fsspec \ python3-geojson \ python3-google-auth-oauthlib \ python3-gpiod \ @@ -74,6 +75,7 @@ PTESTS_FAST_META_PYTHON = "\ python3-tomlkit \ python3-trustme \ python3-typeguard \ + python3-tzdata \ python3-ujson \ python3-u-msgpack-python \ python3-unidiff \ diff --git a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb index 002bd7a39e..794b9d1e4d 100644 --- a/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb +++ b/meta-openembedded/meta-python/recipes-core/images/meta-python-image-ptest.bb @@ -29,7 +29,8 @@ QB_MEM = "-m 1024" #QB_MEM:virtclass-mcextend-<pn> = "-m 4096" # python3-scrypt ptests run into OOMs on RISCV64 qemu QB_MEM:virtclass-mcextend-python3-scrypt = "-m 2048" -QB_MEM:virtclass-mcextend-python3-fastjsonschema = "-m 2048" +# Needs atleast 5G to avoid OOMs +QB_MEM:virtclass-mcextend-python3-fastjsonschema = "-m 5120" QB_MEM:virtclass-mcextend-python3-pillow = "-m 2048" TEST_SUITES = "ping ssh parselogs ptest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.2.0.bb index 3573de551d..ff87e187ca 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/pamela_1.2.0.bb @@ -1,8 +1,8 @@ DESCRIPTION = "Pamela: yet another Python wrapper for PAM" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://PKG-INFO;md5=6b706db92112b8384848de3e5c6adaa3" +LIC_FILES_CHKSUM = "file://PKG-INFO;md5=b5fa9af58a8076d81145be56b6801a2b" -SRC_URI[sha256sum] = "d4b139fe600e192e176a2a368059207a6bffa0e7879879b13f4fcba0163481be" +SRC_URI[sha256sum] = "0ea6e2a99dded8c7783a4a06f2d31f5bdcad894d79101e8f09322e387a34aacf" PYPI_PACKAGE = "pamela" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch new file mode 100644 index 0000000000..8a646874e8 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python-rfc3986-validator/0001-setup.py-move-pytest-runner-to-test_requirements.patch @@ -0,0 +1,32 @@ +From 3531ff73631a0d59234eb4713e7b3a7f5ea57bbb Mon Sep 17 00:00:00 2001 +From: Nicola Lunghi <nicola.lunghi@jci.com> +Date: Thu, 14 Nov 2019 12:17:51 +0000 +Subject: [PATCH] setup.py: move pytest-runner to test_requirements + +This fixes an issue with yocto build. +pytest-runner is only needed when running tests. + +Upstream-Status: Pending +--- + setup.py | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/setup.py b/setup.py +index 53ebea7..ebb0de2 100644 +--- a/setup.py ++++ b/setup.py +@@ -10,9 +10,9 @@ with open('README.md') as readme_file: + + requirements = [] + +-setup_requirements = ['pytest-runner', ] ++setup_requirements = [] + +-test_requirements = ['pytest>=3', ] ++test_requirements = ['pytest>=3', 'pytest-runner'] + + setup( + author="Nicolas Aimetti", +-- +2.20.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb index e6b980266e..e65519ec31 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-a2wsgi_1.10.7.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e10d05d29ec6d8be8bfc503683f1bc9a" inherit pypi python_setuptools_build_meta ptest -SRC_URI[sha256sum] = "50e81ac55aa609fa2c666e42bacc25c424c8884ce6072f1a7e902114b7ee5d63" +SRC_URI[sha256sum] = "ce462ff7e1daac0bc57183c6f800f09a71c2a7a98ddd5cdeca149e3eabf3338e" DEPENDS += " \ python3-pdm-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb index 73dc17423e..1e9ebdf97d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_23.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiofiles_24.1.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" -SRC_URI[sha256sum] = "84ec2218d8419404abcb9f0c02df3f34c6e0a68ed41072acfb1cef5cbc29051a" +SRC_URI[sha256sum] = "22a075c9e5a3810f0c2e48f3008c94d68c65d763b9b03857924c99e57355166c" PYPI_PACKAGE = "aiofiles" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb index edad28e772..940492283b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.3.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohappyeyeballs_2.4.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohappyeyeballs" LICENSE = "PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=fcf6b249c2641540219a727f35d8d2c2" -SRC_URI[sha256sum] = "77e15a733090547a1f5369a1287ddfc944bd30df0eb8993f585259c34b405f4e" +SRC_URI[sha256sum] = "55a1714f084e63d49639800f95716da97a1f173d46a16dfcfda0016abb93b6b2" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb index 57adb1eeba..f167b9d6ed 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.9.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohttp_3.10.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/aiohttp" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=748073912af33aa59430d3702aa32d41" -SRC_URI[sha256sum] = "edea7d15772ceeb29db4aff55e482d4bcfb6ae160ce144f2682de02f6d693551" +SRC_URI[sha256sum] = "f071854b47d39591ce9a17981c46790acb30518e2f83dfca8db2dfa091178691" PYPI_PACKAGE = "aiohttp" inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.3.bb index 438c771dbc..bc4e4016f6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiohue_4.7.3.bb @@ -4,13 +4,12 @@ SECTION = "devel/python" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=dab31a1d28183826937f4b152143a33f" -SRC_URI[sha256sum] = "29b5e5ae05938cac195b1969e70bd6ad4e4e2e105d0e565849803d2a99ff47d1" +SRC_URI[sha256sum] = "9a50dfed1174dfc901ebbd29f1d0da5ce02c9704282ece004de40fce20774783" inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} += " \ - python3-aiohttp \ - python3-asyncio-throttle \ - python3-profile \ - python3-awesomeversion \ +RDEPENDS:${PN} += "\ + python3-aiohttp \ + python3-asyncio-throttle \ + python3-awesomeversion \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch new file mode 100644 index 0000000000..139bdb4f52 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial/0001-use-poetry-core-for-pyproject-base-build.patch @@ -0,0 +1,29 @@ +From 5798a250b465572d84a024389b173dc996690b03 Mon Sep 17 00:00:00 2001 +From: alperak <alperyasinak1@gmail.com> +Date: Thu, 8 Aug 2024 12:56:31 +0300 +Subject: [PATCH] Use poetry-core for pyproject base build + +https://github.com/python-poetry/poetry-core#why-is-this-required + +Upstream-Status: Pending + +Signed-off-by: alperak <alperyasinak1@gmail.com> +--- + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 6243bff..06bc409 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -15,5 +15,5 @@ python = "^3.6" + pyserial = "*" + + [build-system] +-requires = ["poetry>=0.12"] +-build-backend = "poetry.masonry.api" ++requires = ["poetry-core>=0.12"] ++build-backend = "poetry.core.masonry.api" +-- +2.25.1 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb index 8279f27044..5acbcbf974 100755 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aioserial_1.3.1.bb @@ -5,11 +5,10 @@ SECTION = "devel/python" LICENSE = "MPL-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=650b9179efef1ea560df5c08bc32b494" -PYPI_PACKAGE = "aioserial" - +SRC_URI += "file://0001-use-poetry-core-for-pyproject-base-build.patch" SRC_URI[sha256sum] = "702bf03b0eb84b8ef2d8dac5cb925e1e685dce98f77b125569bc6fd2b3b58228" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += " \ python3-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb index fd4ec767c0..029f13cd44 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-aiosignal_1.3.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=cf056e8e7a0a5477451af18b7b5aa98c" SRC_URI[sha256sum] = "54cd96e15e1649b75d6c87526a6ff0b6c1b0dd3459f43d9ca11d48c339b68cfc" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.3.bb index c4853c4437..f046c3ebcd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-alembic_1.13.3.bb @@ -1,12 +1,10 @@ DESCRIPTION = "A database migration tool for SQLAlchemy" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e3023b042cb6002cb398344b51c67093" +LIC_FILES_CHKSUM = "file://LICENSE;md5=00f8f5c8aab58c3e1cd61525a6675174" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "4932c8558bf68f2ee92b9bbcb8218671c627064d5b08939437af6d77dc05e595" - -PYPI_PACKAGE = "alembic" +SRC_URI[sha256sum] = "203503117415561e203aa14541740643a611f641517f0209fcae63e9fa09f1a2" RDEPENDS:${PN} += "\ python3-dateutil \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.2.bb index 6af8989177..d817d8ee5d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ansi2html_1.9.2.bb @@ -1,11 +1,11 @@ DESCRPTION = "ansi2html - Convert text with ANSI color codes to HTML or to LaTeX" -HOMEPAGE = "https://github.com/ralphbean/ansi2html" +HOMEPAGE = "https://github.com/pycontribs/ansi2html" LIC_FILES_CHKSUM = "file://LICENSE;md5=3000208d539ec061b899bce1d9ce9404" -LICENSE = "GPL-3.0-only" +LICENSE = "LGPL-3.0-or-later" PYPI_PACKAGE = "ansi2html" -SRC_URI[sha256sum] = "5c6837a13ecc1903aab7a545353312049dfedfe5105362ad3a8d9d207871ec71" +SRC_URI[sha256sum] = "3453bf87535d37b827b05245faaa756dbab4ec3d69925e352b6319c3c955c0a5" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb index a48e1cfaee..90d7ee271c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-apispec_6.6.1.bb @@ -1,10 +1,10 @@ SUMMARY = "A pluggable API specification generator. Currently supports the OpenAPI Specification (f.k.a. the Swagger specification)." HOMEPAGE = "https://github.com/marshmallow-code/apispec" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3d9c303644a2e62578f0347748a80358" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a75956865b40c80a37c1e864716592b4" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "42b8a6833cf154c9dbd22d006b56bf9c49c972d32d24fe716fd734e0f6b739b8" +SRC_URI[sha256sum] = "f5caa47cee75fe03b9c50b5594048b4c052eeca2c212e0dac12dbb6175d9a659" RDEPENDS:${PN} += "python3-packaging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb index d96861010e..a5cf6298a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argcomplete_3.5.0.bb @@ -3,11 +3,15 @@ HOMEPAGE = "https://github.com/kislyuk/argcomplete" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "fd03ff4a5b9e6580569d34b273f741e85cd9e072f3feeeee3eba4891c70eda62" +SRC_URI[sha256sum] = "4349400469dccfb7950bb60334a680c58d88699bff6159df61251878dc6bf74b" PYPI_PACKAGE = "argcomplete" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + python3-setuptools-scm-native \ +" RDEPENDS:${PN} += "\ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.3.bb index afcd7d9665..82b45d5aaa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-argh_0.31.3.bb @@ -14,7 +14,7 @@ LICENSE = "LGPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING.LESSER;md5=3000208d539ec061b899bce1d9ce9404 \ " -SRC_URI[sha256sum] = "db1c34885804f7d4646c385dc2fb19b45298561322f4c15eae1b133993f9e323" +SRC_URI[sha256sum] = "f30023d8be14ca5ee6b1b3eeab829151d7bbda464ae07dc4dd5347919c5892f9" inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb index d7e7f56981..e5f05bd0e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-astroid_3.3.2.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=a70cf540abf41acb644ac3b621b2fad1" -SRC_URI[sha256sum] = "8ead48e31b92b2e217b6c9733a21afafe479d52d6e164dd25fb1a770c7c3cf94" +SRC_URI[sha256sum] = "99e9b5b602cbb005434084309213d6af32bf7a9b743c836749168b8e2b330cbd" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_24.4.2.bb index d9cc40b1b4..d785a76cc7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_23.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-autobahn_24.4.2.bb @@ -1,9 +1,9 @@ DESCRIPTION = "WebSocket client & server library, WAMP real-time framework" HOMEPAGE = "http://crossbar.io/autobahn" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=3e2c2c2cc2915edc5321b0e6b1d3f5f8" +LIC_FILES_CHKSUM = "file://LICENSE;md5=588502cb4ffc65da2b26780d6baa5a40" -SRC_URI[sha256sum] = "ec9421c52a2103364d1ef0468036e6019ee84f71721e86b36fe19ad6966c1181" +SRC_URI[sha256sum] = "a2d71ef1b0cf780b6d11f8b205fd2c7749765e65795f2ea7d823796642ee92c9" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_24.8.1.bb index 9e33fe7831..e2a31bea1e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_22.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-automat_24.8.1.bb @@ -3,14 +3,9 @@ HOMEPAGE = "https://github.com/glyph/Automat" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4ad213bcca81688e94593e5f60c87477" -SRC_URI[sha256sum] = "e56beb84edad19dcc11d30e8d9b895f75deeb5ef5e96b84a467066b3b84bb04e" +SRC_URI[sha256sum] = "b34227cf63f6325b8ad2399ede780675083e439b20c323d376373d8ee6306d88" DEPENDS += "python3-setuptools-scm-native" -PYPI_PACKAGE = "Automat" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} += "\ - python3-attrs \ - python3-six \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb index 8b19605b1e..8bb5ddd54e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-awesomeversion_24.6.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE.md;md5=92622b5a8e216099be741d78328bae5d" -SRC_URI[sha256sum] = "47a6dcbbe2921b725f75106a66ab30f26f1f33dbc5e07bc8e1e39d8eb921f53c" +SRC_URI[sha256sum] = "aee7ccbaed6f8d84e0f0364080c7734a0166d77ea6ccfcc4900b38917f1efc71" RDEPENDS:${PN} += "python3-profile python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb index 8b0968857f..730bf116ae 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bandit_1.7.9.bb @@ -2,7 +2,7 @@ SUMMARY = "Security oriented static analyser for python code." LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=34400b68072d710fecd0a2940a0d1658" -SRC_URI[sha256sum] = "36de50f720856ab24a24dbaa5fee2c66050ed97c1477e0a1159deab1775eab6b" +SRC_URI[sha256sum] = "7c395a436743018f7be0a4cbb0a4ea9b902b6d87264ddecf8cfdc73b4f78ff61" DEPENDS = "python3-pbr-native python3-git python3-pbr python3-pyyaml python3-six python3-stevedore" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb index 6401322e2c..bdf77c7d01 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bitstruct_8.19.0.bb @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d9aa4ec07de78abae21c490c9ffe61bd" SRC_URI[sha256sum] = "d75ba9dded85c17e885a209a00eb8e248ee40762149f2f2a79360ca857467dac" -PYPI_PACKAGE = "bitstruct" - -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-bleak_0.21.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb index 96f3fcbcfe..bb1d7c2b13 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-bleak_0.21.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-bleak_0.22.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/hbldh/bleak" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=bcbc2069a86cba1b5e47253679f66ed7" -SRCREV = "054b092e19c7a45d5ea07d8948022f54117fe5e8" +SRCREV = "c746071a3fcc3b5e69db6d6b23445ec3505d7730" PYPI_SRC_URI = "git://github.com/hbldh/bleak.git;protocol=https;branch=develop" inherit pypi python_poetry_core ptest @@ -26,8 +26,7 @@ do_install_ptest() { } RDEPENDS:${PN} += " \ - python3-core (>3.7) \ - python3-async-timeout \ + python3-core (>3.8) \ python3-dbus-fast \ python3-xml \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb index 678f12b730..542c8640d7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-brotli_1.1.0.bb @@ -8,10 +8,10 @@ PYPI_PACKAGE = "Brotli" SRC_URI[sha256sum] = "81de08ac11bcb85841e440c13611c00b67d3bf82698314928d0b676362546724" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} = "\ - python3-cffi \ +RDEPENDS:${PN} += " \ + python3-cffi \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.5.0.bb index 3ef75d4703..00e208f9cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.3.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cachetools_5.5.0.bb @@ -28,6 +28,6 @@ do_install_ptest() { cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } -SRC_URI[sha256sum] = "ba29e2dfa0b8b556606f097407ed1aa62080ee108ab0dc5ec9d6a723a007d105" +SRC_URI[sha256sum] = "2cc24fb4cbe39633fb7badd9db9ca6295d766d9c2995f245725a46715d050f2a" BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb index 9ca926d66c..b0d87f4e37 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-can_4.2.2.bb @@ -5,9 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e6a600fd5e1d9cbde2d983680233ad02" SRC_URI[sha256sum] = "6ad50f4613289f3c4d276b6d2ac8901d776dcb929994cce93f55a69e858c595f" -PYPI_PACKAGE="python-can" +PYPI_PACKAGE = "python-can" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-aenum \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb index c9c98b6fb5..37c3ab6478 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-cbor2_5.6.4.bb @@ -1,31 +1,26 @@ DESCRIPTION = "An implementation of RFC 7049 - Concise Binary Object Representation (CBOR)." -DEPENDS +="python3-setuptools-scm-native" - -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" - -SRC_URI[sha256sum] = "e6f0ae2751c2d333a960e0807c0611494eb1245631a167965acbc100509455d3" - -inherit pypi python_setuptools_build_meta ptest - +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a79e64179819c7ce293372c059f1dbd8" DEPENDS += "python3-setuptools-scm-native" +SRC_URI[sha256sum] = "1c533c50dde86bef1c6950602054a0ffa3c376e8b0e20c7b8f5b108793f6983e" SRC_URI += " \ file://run-ptest \ " +inherit pypi python_setuptools_build_meta ptest + +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} + RDEPENDS:${PN}-ptest += " \ python3-hypothesis \ python3-pytest \ python3-unittest-automake-output \ python3-unixadmin \ " - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} - RDEPENDS:${PN} += " \ python3-datetime \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb index d9240e1383..8daf82481f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-classes_0.4.1.bb @@ -5,6 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=155fbcc756c8ae5265d252d23e20908f" SRC_URI[sha256sum] = "4de4fdd6c5c38607bbd8ad76703d7cc4dbe007cfa78e8ef1f62fc6ac55303e23" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += "python3-typing-extensions" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb index b773ed6b8b..46cf1b3784 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-click-repl_0.3.0.bb @@ -5,6 +5,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=580facc4832cac548fad94845542da44" SRC_URI[sha256sum] = "17849c23dba3d667247dc4defe1757fff98694e90fe37474f3feebb69ced26a9" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} = "python3-click python3-prompt-toolkit" +RDEPENDS:${PN} += " \ + python3-click \ + python3-prompt-toolkit \ + " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb index 0f364c424d..3871244031 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-colorama_0.4.6.bb @@ -1,6 +1,6 @@ SUMMARY = "Cross-platform colored terminal text." HOMEPAGE = "https://github.com/tartley/colorama" -LICENSE = "BSD-2-Clause" +LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b4936429a56a652b84c5c01280dcaa26" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb index 8dc706fdfd..96e579c78d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-configobj_5.0.8.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3d6f99b84d9a94610c62e48fa2e59e72" PYPI_PACKAGE = "configobj" SRC_URI[sha256sum] = "6f704434a07dc4f4dc7c9a745172c1cad449feb548febd9f7fe362629c627a97" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-pprint \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.5.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb index 0df341c543..7749158f5b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.5.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-coverage_7.6.1.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://coverage.readthedocs.io" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ee41112a44fe7014dce33e26468ba93" -SRC_URI[sha256sum] = "04aefca5190d1dc7a53a4c1a5a7f8568811306d7a8ee231c42fb69215571944f" +SRC_URI[sha256sum] = "953510dfb7b12ab69d20135a0662397f077c59b1e6379a768e97c59d852ee51d" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ python3-crypt \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb index da756ea074..125a7ad877 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-crc32c_2.3.bb @@ -1,7 +1,7 @@ SUMMARY = "A python package implementing the crc32c algorithmin hardware and software" HOMEPAGE = "https://github.com/ICRAR/crc32c" -LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.0-or-later" +LICENSE = "BSD-2-Clause & BSD-3-Clause & CRC32C-ADLER & LGPL-2.1-or-later" LIC_FILES_CHKSUM = " \ file://LICENSE;md5=4fbd65380cdd255951079008b364516c \ file://LICENSE.google-crc32c;md5=e9ed01b5e5ac9eae23fc2bb33701220c \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_3.0.3.bb index 01ee048404..b0cda74f48 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_2.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-croniter_3.0.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b8ee59850b882cbf623188489ea748e2" PYPI_PACKAGE = "croniter" -SRC_URI[sha256sum] = "f1f8ca0af64212fbe99b1bee125ee5a1b53a9c1b433968d8bca8817b79d237f3" +SRC_URI[sha256sum] = "34117ec1741f10a7bd0ec3ad7d8f0eb8fa457a2feb9be32e6a2250e158957668" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch new file mode 100644 index 0000000000..316f7d9618 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon/0001-Use-version-from-packaging-module-instead-of-setupto.patch @@ -0,0 +1,44 @@ +From b7418ab4a3232431373bf0680c6b74fef06910de Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 10 Aug 2024 22:44:08 -0700 +Subject: [PATCH] Use version from packaging module instead of setuptools extern + +Fixes build problems when using PEP-575 build backend + + +Drop the patch on upgrading to >= 3.0.2 + +Upstream-Status: Backport [https://pagure.io/fork/khemraj/python-daemon/c/3bbc46967d35cd7e05677018bdc9d552efaeea3e?branch=main] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test_version.py | 2 +- + version.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/test_version.py b/test_version.py +index c43cd36..d0a124d 100644 +--- a/test_version.py ++++ b/test_version.py +@@ -23,7 +23,7 @@ import docutils.writers + import setuptools + import setuptools.command + import setuptools.dist +-from setuptools.extern.packaging.version import InvalidVersion ++from packaging.version import InvalidVersion + import testscenarios + import testtools + +diff --git a/version.py b/version.py +index 20d3ef3..fbdc462 100644 +--- a/version.py ++++ b/version.py +@@ -36,7 +36,7 @@ import setuptools.command.build + import setuptools.command.build_py + import setuptools.command.egg_info + import setuptools.dist +-import setuptools.extern.packaging.version ++import packaging.version + + + def ensure_class_bases_begin_with(namespace, class_name, base_class): diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb index 715d3bf120..cb85262b41 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-daemon_3.0.1.bb @@ -11,8 +11,9 @@ RDEPENDS:${PN} = "python3-docutils \ LICENSE = "Apache-2.0 & GPL-3.0-only" LIC_FILES_CHKSUM = "file://README;md5=a3a94c615dc969a70525f1eebbacf235" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta +SRC_URI += "file://0001-Use-version-from-packaging-module-instead-of-setupto.patch" SRC_URI[sha256sum] = "6c57452372f7eaff40934a1c03ad1826bf5e793558e87fef49131e6464b4dae5" PYPI_PACKAGE = "python-daemon" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb index a4087d6473..ccac699247 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.21.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dbus-fast_2.24.2.bb @@ -3,11 +3,17 @@ HOMEPAGE = "https://github.com/bluetooth-devices/dbus-fast" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=729e372b5ea0168438e4fd4a00a04947" -SRC_URI[sha256sum] = "8d0f0f61d007c1316ce79cde35ed52c0ce8ce229fd0f0bf8c9af2013ab4516a7" +SRC_URI[sha256sum] = "20c517dc70dbc940b8bf2e0f079abf3dfe821fdda3013641a17e3d8f18e131ae" PYPI_PACKAGE = "dbus_fast" -inherit pypi setuptools3 +inherit pypi python_poetry_core + +DEPENDS += " \ + python3-setuptools-native \ + python3-wheel-native \ + python3-cython-native \ + " RDEPENDS:${PN} += " \ python3-core (>=3.7) \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb index 04e7f4bfb8..3481ec06bd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dill_0.3.8.bb @@ -5,9 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=a41509b57cc475ed93f8cb1dbbfaeec1" SRC_URI[sha256sum] = "3ebe3c479ad625c4553aca177444d89b486b1d84982eeacded644afc0cf797ca" -inherit pypi setuptools3 - -PYPI_PACKAGE_EXT = "tar.gz" +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ python3-multiprocessing \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-dirty-equals_0.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-dirty-equals_0.8.0.bb index ea9303b17e..584d787a7b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-dirty-equals_0.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-dirty-equals_0.8.0.bb @@ -10,7 +10,7 @@ HOMEPAGE = "https://github.com/samuelcolvin/dirty-equals" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI[sha256sum] = "a580513f3285e93656a770a04e428f8bfc513848877bf278282dbfbb907fdbb4" +SRC_URI[sha256sum] = "798db3b9481b9a5024c0e520946507676ed2f0c65317d3e95bdce1a01657cf60" S = "${WORKDIR}/dirty_equals-${PV}" @@ -18,4 +18,9 @@ inherit pypi python_hatchling PYPI_PACKAGE = "dirty_equals" -RDEPENDS:${PN} += "python3-pytz" +RDEPENDS:${PN} += " \ + python3-pytz \ + python3-core \ + python3-json \ + python3-netclient \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.16.bb index 0642b7e7c3..9254e8b009 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_4.2.16.bb @@ -1,7 +1,7 @@ require python-django.inc inherit setuptools3 -SRC_URI[sha256sum] = "6e6ff3db2d8dd0c986b4eec8554c8e4f919b5c1ff62a5b4390c17aff2ed6e5c4" +SRC_URI[sha256sum] = "6f1616c2786c408ce86ab7e10f792b8f15742f7b7b7460243929cb371e7f1dad" RDEPENDS:${PN} += "\ python3-sqlparse \ @@ -10,5 +10,5 @@ RDEPENDS:${PN} += "\ # Set DEFAULT_PREFERENCE so that the LTS version of django is built by # default. To build the 4.x branch, -# PREFERRED_VERSION_python3-django = "4.2.11" can be added to local.conf +# PREFERRED_VERSION_python3-django = "4.2.16" can be added to local.conf DEFAULT_PREFERENCE = "-1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.6.bb deleted file mode 100644 index 69b25742dc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.6.bb +++ /dev/null @@ -1,9 +0,0 @@ -require python-django.inc -inherit setuptools3 - -SRC_URI[sha256sum] = "ff1b61005004e476e0aeea47c7f79b85864c70124030e95146315396f1e7951f" - -RDEPENDS:${PN} += "\ - python3-sqlparse \ - python3-asgiref \ -" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.9.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.9.bb new file mode 100644 index 0000000000..b3fb301ede --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-django_5.0.9.bb @@ -0,0 +1,9 @@ +require python-django.inc +inherit python_setuptools_build_meta + +SRC_URI[sha256sum] = "6333870d342329b60174da3a60dbd302e533f3b0bb0971516750e974a99b5a39" + +RDEPENDS:${PN} += "\ + python3-sqlparse \ + python3-asgiref \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.2.bb index 9515aa2296..047aba137b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-djangorestframework_3.15.2.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://pypi.python.org/pypi/djangorestframework" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=7879a5a716147a784f7e524c9cf103c1" -SRC_URI[sha256sum] = "f88fad74183dfc7144b2756d0d2ac716ea5b4c7c9840995ac3bfd8ec034333c1" +SRC_URI[sha256sum] = "36fe88cd2d6c6bec23dca9804bab2ba5517a8bb9d8f47ebc68981b56840107ad" PYPI_PACKAGE = "djangorestframework" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb index e095cb8a32..937d968607 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-elementpath_4.5.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/sissaschool/elementpath" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5dbb7fb7d72da3921202dd7b995d3ecf" -SRC_URI[sha256sum] = "dfc4b8ca3d87966dcb0df40b5b6d04a98f053683271930fad9e7fa000924dfb2" +SRC_URI[sha256sum] = "affdc8de95af1a4c10d1d2ed79c6fa56b59c26c7fce64b73497569e9dea46998" PYPI_PACKAGE = "elementpath" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.2.0.bb index 90a22e5a0e..c17cce7237 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.1.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-email-validator_2.2.0.bb @@ -1,9 +1,9 @@ SUMMARY = "A robust email address syntax and deliverability validation library." SECTION = "devel/python" -LICENSE = "CC0-1.0" +LICENSE = "Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=2890aee62bd2a4c3197e2059016a397e" -SRC_URI[sha256sum] = "200a70680ba08904be6d1eef729205cc0d687634399a5924d842533efb824b84" +SRC_URI[sha256sum] = "cb690f344c617a714f22e66ae771445a1ceb46821152df8e165c5f9a364582b7" PYPI_PACKAGE = "email_validator" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb index 0f548cf86f..1137e744cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-hash_0.7.0.bb @@ -1,14 +1,20 @@ -SUMMARY = "The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3." +SUMMARY = "eth-hash: The Ethereum hashing function, keccak256, sometimes (erroneously) called sha3" HOMEPAGE = "https://github.com/ethereum/eth-hash" -SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3d7bdfe69b1ffbde073ca6e96f5c53f7" SRC_URI[sha256sum] = "bacdc705bfd85dadd055ecd35fd1b4f846b671add101427e089a4ca2e8db310a" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} = "\ - python3-logging \ - python3-pycryptodome \ -" +PACKAGECONFIG ?= "" +PACKAGECONFIG[dev] = ",,,python3-build python3-bumpversion python3-ipython python3-pre-commit python3-pytest python3-pytest-xdist python3-sphinx python3-sphinx_rtd_theme python3-towncrier python3-tox python3-twine python3-wheel" +PACKAGECONFIG[docs] = ",,,python3-sphinx python3-sphinx_rtd_theme python3-towncrier" +PACKAGECONFIG[pycryptodome] = ",,,python3-pycryptodome" +PACKAGECONFIG[pysha3python-version-smaller-3-dot-9] = ",,,python3-pysha3" +PACKAGECONFIG[pysha3python-version-bigger--equals-3-dot-9] = ",,,python3-safe-pysha3" +PACKAGECONFIG[test] = ",,,python3-pytest python3-pytest-xdist" + +RDEPENDS:${PN} += "python3-core python3-logging python3-pycryptodome" + +PYPI_PACKAGE = "eth-hash" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_3.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_5.0.0.bb index faca03865b..f0a5e24413 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_3.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eth-utils_5.0.0.bb @@ -4,7 +4,9 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=6749008d847c14b9718949c2e24d5c0a" -SRC_URI[sha256sum] = "8721869568448349bceae63c277b75758d11e0dc190e7ef31e161b89619458f1" +SRC_URI[sha256sum] = "a5eb9555f43f4579eb83cb84f9dda9f3d6663bbd4a5a6b693f8d35045f305a1f" + +PYPI_PACKAGE = "eth_utils" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb index dcf50f339d..f098ce4ab3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-evdev_1.7.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0ff275b442f45fc06287544cf713016f" SRC_URI[sha256sum] = "0c72c370bda29d857e188d931019c32651a9c1ea977c08c8d939b1ced1637fde" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta do_compile:prepend() { rm -rf ${S}/evdev/ecodes.c diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb index f70099ab94..84de0d8e44 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.36.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-eventlet_0.37.0.bb @@ -4,9 +4,11 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=56472ad6de4caf50e05332a34b66e778" -SRC_URI[sha256sum] = "d227fe76a63d9e6a6cef53beb8ad0b2dc40a5e7737c801f4b474cfae1db07bc5" +SRC_URI[sha256sum] = "fa49bf5a549cdbaa06919679979ea022ac8f8f3cf0499f26849a1cd8e64c30b1" -inherit pypi setuptools3 +inherit pypi python_hatchling + +DEPENDS += "python3-hatch-vcs-native" RDEPENDS:${PN} += " \ python3-dnspython \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.1.0.bb index 3ee1e66f97..4df84e638a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-executing_2.1.0.bb @@ -6,4 +6,4 @@ DEPENDS = "python3-setuptools-scm-native" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "35afe2ce3affba8ee97f2d69927fa823b08b472b7b994e36a52a964b93d16147" +SRC_URI[sha256sum] = "8ea27ddd260da8150fa5a708269c4a10e76161e2496ec3e587da9e3c0fe4b9ab" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb index 2fbc277139..2099d791dd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fann2_1.1.2.bb @@ -1,6 +1,6 @@ SUMMARY = "Python bindings for Fast Artificial Neural Networks 2.2.0 (FANN >= 2.2.0)" SECTION = "devel/python" -LICENSE = "LGPL-2.0-only" +LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=c73b943dc75f6f65e007c56ac6515c8f" SRC_URI[md5sum] = "0b85b418018746d63ed66b55465697a9" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.20.0.bb index b2e969c5c1..4dd9444a9a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.18.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fastjsonschema_2.20.0.bb @@ -6,23 +6,22 @@ HOMEPAGE = "https://github.com/seznam/python-fastjsonschema" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=18950e8362b69c0c617b42b8bd8e7532" -SRCREV = "756540088687cda351390f687b92e602feaa7dc6" -PYPI_SRC_URI = "git://github.com/horejsek/python-fastjsonschema;protocol=https;branch=master" +SRC_URI[sha256sum] = "3d48fc5300ee96f5d116f10fe6f28d938e6008f59a6a025c2649475b87f76a23" SRC_URI += "file://run-ptest" inherit ptest pypi setuptools3 -S = "${WORKDIR}/git" - do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ } +# python3-misc for timeit.py RDEPENDS:${PN}-ptest += "\ python3-colorama \ python3-jsonschema \ + python3-misc \ python3-pylint \ python3-pytest \ python3-pytest-benchmark \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb index 5289ad3745..0491d02b1d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-file-magic_0.4.1.bb @@ -7,9 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e949c0b3fb4fd86232f00c6ee0bdef3" SRC_URI[sha256sum] = "a91d1483117f7ed48cd0238ad9be36b04824d57e9c38ea7523113989e81b9c53" -PYPI_PACKAGE="file-magic" - -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += " \ file \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb index d94ad4bf3b..abafa1245b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-filelock_3.16.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://py-filelock.readthedocs.io/" LICENSE = "Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=911690f51af322440237a253d695d19f" -SRC_URI[sha256sum] = "6ea72da3be9b8c82afd3edcf99f2fffbb5076335a5ae4d03248bb5b6c3eae78a" +SRC_URI[sha256sum] = "c249fbfcd5db47e5e2d6d62198e565475ee65e4831e2561c8e313fa7eb961435" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling @@ -14,3 +14,9 @@ inherit pypi python_hatchling DEPENDS += "\ python3-hatch-vcs-native \ " + +RDEPENDS:${PN} += " \ + python3-core \ + python3-logging \ + python3-asyncio \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch new file mode 100644 index 0000000000..9049b2ffe6 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors/CVE-2024-6221.patch @@ -0,0 +1,110 @@ +From 7ae310c56ac30e0b94fb42129aa377bf633256ec Mon Sep 17 00:00:00 2001 +From: Adriano Sela Aviles <adriano.selaviles@gmail.com> +Date: Fri, 30 Aug 2024 12:14:31 -0400 +Subject: [PATCH] Backwards Compatible Fix for CVE-2024-6221 (#363) + +CVE: CVE-2024-6221 + +Upstream-Status: Backport [https://github.com/corydolphin/flask-cors/commit/7ae310c56ac30e0b94fb42129aa377bf633256ec] + +Signed-off-by: Soumya Sambu <soumya.sambu@windriver.com> +--- + docs/configuration.rst | 14 ++++++++++++++ + flask_cors/core.py | 8 +++++--- + flask_cors/extension.py | 16 ++++++++++++++++ + 3 files changed, 35 insertions(+), 3 deletions(-) + +diff --git a/docs/configuration.rst b/docs/configuration.rst +index 91282d3..c750cf4 100644 +--- a/docs/configuration.rst ++++ b/docs/configuration.rst +@@ -23,6 +23,19 @@ CORS_ALLOW_HEADERS (:py:class:`~typing.List` or :py:class:`str`) + Headers to accept from the client. + Headers in the :http:header:`Access-Control-Request-Headers` request header (usually part of the preflight OPTIONS request) matching headers in this list will be included in the :http:header:`Access-Control-Allow-Headers` response header. + ++CORS_ALLOW_PRIVATE_NETWORK (:py:class:`bool`) ++ If True, the response header :http:header:`Access-Control-Allow-Private-Network` ++ will be set with the value 'true' whenever the request header ++ :http:header:`Access-Control-Request-Private-Network` has a value 'true'. ++ ++ If False, the reponse header :http:header:`Access-Control-Allow-Private-Network` ++ will be set with the value 'false' whenever the request header ++ :http:header:`Access-Control-Request-Private-Network` has a value of 'true'. ++ ++ If the request header :http:header:`Access-Control-Request-Private-Network` is ++ not present or has a value other than 'true', the response header ++ :http:header:`Access-Control-Allow-Private-Network` will not be set. ++ + CORS_ALWAYS_SEND (:py:class:`bool`) + Usually, if a request doesn't include an :http:header:`Origin` header, the client did not request CORS. + This means we can ignore this request. +@@ -83,6 +96,7 @@ Default values + ~~~~~~~~~~~~~~ + + * CORS_ALLOW_HEADERS: "*" ++* CORS_ALLOW_PRIVATE_NETWORK: True + * CORS_ALWAYS_SEND: True + * CORS_AUTOMATIC_OPTIONS: True + * CORS_EXPOSE_HEADERS: None +diff --git a/flask_cors/core.py b/flask_cors/core.py +index 5358036..bd011f4 100644 +--- a/flask_cors/core.py ++++ b/flask_cors/core.py +@@ -36,7 +36,7 @@ CONFIG_OPTIONS = ['CORS_ORIGINS', 'CORS_METHODS', 'CORS_ALLOW_HEADERS', + 'CORS_MAX_AGE', 'CORS_SEND_WILDCARD', + 'CORS_AUTOMATIC_OPTIONS', 'CORS_VARY_HEADER', + 'CORS_RESOURCES', 'CORS_INTERCEPT_EXCEPTIONS', +- 'CORS_ALWAYS_SEND'] ++ 'CORS_ALWAYS_SEND', 'CORS_ALLOW_PRIVATE_NETWORK'] + # Attribute added to request object by decorator to indicate that CORS + # was evaluated, in case the decorator and extension are both applied + # to a view. +@@ -56,7 +56,8 @@ DEFAULT_OPTIONS = dict(origins='*', + vary_header=True, + resources=r'/*', + intercept_exceptions=True, +- always_send=True) ++ always_send=True, ++ allow_private_network=True) + + + def parse_resources(resources): +@@ -186,7 +187,8 @@ def get_cors_headers(options, request_headers, request_method): + + if ACL_REQUEST_HEADER_PRIVATE_NETWORK in request_headers \ + and request_headers.get(ACL_REQUEST_HEADER_PRIVATE_NETWORK) == 'true': +- headers[ACL_RESPONSE_PRIVATE_NETWORK] = 'true' ++ allow_private_network = 'true' if options.get('allow_private_network') else 'false' ++ headers[ACL_RESPONSE_PRIVATE_NETWORK] = allow_private_network + + # This is a preflight request + # http://www.w3.org/TR/cors/#resource-preflight-requests +diff --git a/flask_cors/extension.py b/flask_cors/extension.py +index c00cbff..694953f 100644 +--- a/flask_cors/extension.py ++++ b/flask_cors/extension.py +@@ -136,6 +136,22 @@ class CORS(object): + + Default : True + :type vary_header: bool ++ ++ :param allow_private_network: ++ If True, the response header `Access-Control-Allow-Private-Network` ++ will be set with the value 'true' whenever the request header ++ `Access-Control-Request-Private-Network` has a value 'true'. ++ ++ If False, the reponse header `Access-Control-Allow-Private-Network` ++ will be set with the value 'false' whenever the request header ++ `Access-Control-Request-Private-Network` has a value of 'true'. ++ ++ If the request header `Access-Control-Request-Private-Network` is ++ not present or has a value other than 'true', the response header ++ `Access-Control-Allow-Private-Network` will not be set. ++ ++ Default : True ++ :type allow_private_network: bool + """ + + def __init__(self, app=None, **kwargs): +-- +2.40.0 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb index 1d0d86b4e7..77b51c5515 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask-cors_4.0.0.bb @@ -9,6 +9,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=118fecaa576ab51c1520f95e98db61ce" PYPI_PACKAGE = "Flask-Cors" +SRC_URI += " \ + file://CVE-2024-6221.patch \ +" + SRC_URI[sha256sum] = "f268522fcb2f73e2ecdde1ef45e2fd5c71cc48fe03cffb4b441c6d1b40684eb0" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb index 98e773008c..de755dc294 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flask_3.0.3.bb @@ -28,6 +28,10 @@ RDEPENDS:${PN} = " \ python3-werkzeug \ " +RDEPENDS:${PN}-ptest += "\ + python3-pytest \ + python3-unittest-automake-output \ +" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-flexparser_0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-flexparser_0.3.1.bb index e45175f5a5..7867dc5015 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-flexparser_0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-flexparser_0.3.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=32f547dac365c355d2cdbcd7ebea9144" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "692e7524d9e14b2b1231b772b091d7d6296951deb383f5a67bfbd0ecb0b9fa9a" +SRC_URI[sha256sum] = "36f795d82e50f5c9ae2fde1c33f21f88922fdd67b7629550a3cc4d0b40a66856" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb new file mode 100644 index 0000000000..49ca4b3e93 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-fsspec_2024.9.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "A specification that python filesystems should adhere to." +HOMEPAGE = "https://github.com/fsspec/filesystem_spec" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=b38a11bf4dcdfc66307f8515ce1fbaa6" + +DEPENDS = "python3-hatch-vcs-native python3-hatchling-native" +SRC_URI[sha256sum] = "4b0afb90c2f21832df142f292649035d80b421f60a9e1c027802e5a0da2b04e8" + +inherit pypi python_hatchling ptest + +PYPI_PACKAGE = "fsspec" + +RDEPENDS:${PN}-ptest += "\ + python3-pytest \ + python3-pytest-mock \ + python3-pytest-asyncio \ + python3-pytest-cov \ + python3-pytest-benchmark \ + python3-aiohttp \ + python3-numpy \ + python3-requests \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.6.0.bb index 9c750ea3b0..af46c3feb7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.5.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gast_0.6.0.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3ad9b6802e713fc5e307e1230f1ea90" -SRC_URI[sha256sum] = "9c270fe5f4b130969b54174de7db4e764b09b4f7f67ccfc32480e29f78348d97" +SRC_URI[sha256sum] = "88fc5300d32c7ac6ca7b515310862f71e6fdf2c029bbec7c66c0f5dd47b6b1fb" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb index ceba10b65b..7339484379 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-geomet_1.1.0.bb @@ -6,13 +6,9 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=d2794c0df5b907fdace235a619d80314" SRCNAME = "geomet" -SRC_URI[sha256sum] = "cb52411978ee01ff104ab48f108d7333b14423ae7a15a65fee25b7d29bda2e1b" +SRC_URI[sha256sum] = "51e92231a0ef6aaa63ac20c443377ba78a303fd2ecd179dc3567de79f3c11605" -S = "${WORKDIR}/git" -SRC_URI = "git://github.com/geomet/geomet.git;protocol=https;branch=master" -SRCREV = "6ac73c312b52aca328db2e61d90c5e363b62639f" - -inherit setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ python3-click \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb index 0a74f52820..e44972178e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gevent_24.2.1.bb @@ -4,7 +4,7 @@ a high-level synchronous API on top of the libevent event loop." HOMEPAGE = "http://www.gevent.org" LICENSE = "MIT & Python-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=4de99aac27b470c29c6c309e0c279b65" -DEPENDS += "python3-greenlet libev libuv c-ares python3-cython-native" +DEPENDS += "python3-greenlet-native python3-greenlet libev libuv python3-cython-native python3-cffi-native" RDEPENDS:${PN} = "python3-greenlet \ python3-mime \ @@ -18,7 +18,7 @@ SRC_URI += "file://0001-_setuputils.py-Do-not-add-sys_inc_dir.patch \ SRC_URI[sha256sum] = "432fc76f680acf7cf188c2ee0f5d3ab73b63c1f03114c7cd8a34cebbe5aa2056" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta # Don't embed libraries, link to the system provided libs instead export GEVENTSETUP_EMBED_CARES = "0" @@ -36,3 +36,8 @@ do_configure:append() { do_compile:append() { sed -i -e 's#${WORKDIR}##g' ${S}/src/gevent/*.c ${S}/src/gevent/libev/*.c ${S}/src/gevent/resolver/*.c } + +# http://errors.yoctoproject.org/Errors/Details/766918/ +# src/gevent/queue.c:11894:83: error: passing argument 1 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] +# src/gevent/queue.c:11894:114: error: passing argument 4 of '__pyx_vtabptr_6gevent_14_gevent_cqueue_UnboundQueue->__pyx_base.put' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.19.1.bb index d177fcde5f..f21b41aab7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-core_2.19.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "cf1b7c2694047886d2af1128a03ae99e391108a08804f87cfd35970e49c9cd10" +SRC_URI[sha256sum] = "f4695f1e3650b316a795108a76a1c416e6afb036199d1c1f1f110916df479ffd" RDEPENDS:${PN} += "\ python3-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.131.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.135.0.bb index 91889fa4e4..2b48456031 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.131.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-api-python-client_2.135.0.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/googleapis/google-api-python-client" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "1c03e24af62238a8817ecc24e9d4c32ddd4cb1f323b08413652d9a9a592fc00d" +SRC_URI[sha256sum] = "b552a28123ed95493035698db80e8ed78c9106a8b422e63a175150b9b55b704e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.29.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb index e8d438df02..c51be16505 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.29.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-google-auth_2.30.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" inherit pypi setuptools3 ptest -SRC_URI[sha256sum] = "672dff332d073227550ffc7457868ac4218d6c500b155fe6cc17d2b13602c360" +SRC_URI[sha256sum] = "ab630a1320f6720909ad76a7dbdb6841cdf5c66b328d690027e4867bdfb16688" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.2.bb index aee2337267..5539d19f68 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-googleapis-common-protos_1.63.2.bb @@ -1,11 +1,11 @@ DESCRIPTION = "Common protobufs used in Google APIs" HOMEPAGE = "https://github.com/googleapis/python-api-common-protos" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" inherit pypi setuptools3 -SRC_URI[sha256sum] = "17ad01b11d5f1d0171c06d3ba5c04c54474e883b66b949722b4938ee2694ef4e" +SRC_URI[sha256sum] = "27c5abdffc4911f28101e635de1533fb4cfd2c37fbaa9174587c799fac90aa87" RDEPENDS:${PN} += "\ python3-grpcio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.2.1.bb index d8c8628daa..8e1cbf849b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gpiod_2.2.1.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=237;endline=237;md5=f5ddb56912b7f2 SRC_URI += "file://run-ptest" -SRC_URI[sha256sum] = "a33193d6cab79d252329f71666a35a3668e04f1f82bf9b93ee2c9ae852398b20" +SRC_URI[sha256sum] = "802dad3a89016339a231c462c6da2d56c820f5fb11519728ff86cdff0a16da96" inherit setuptools3-base python_pep517 ptest pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_3.1.0.bb index abd6c49caf..11e8a76c8d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_3.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-greenlet_3.1.0.bb @@ -4,6 +4,8 @@ LICENSE = "MIT & PSF-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=e95668d68e4329085c7ab3535e6a7aee \ file://LICENSE.PSF;md5=c106931d9429eda0492617f037b8f69a" -SRC_URI[sha256sum] = "43374442353259554ce33599da8b692d5aa96f8976d567d4badf263371fbe491" +SRC_URI[sha256sum] = "b395121e9bbe8d02a750886f108d540abe66075e61e22f7353d9acb0b81be0f0" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.62.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.62.2.bb new file mode 100644 index 0000000000..ed5ede4252 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-channelz_1.62.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Google gRPC channelz" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "python3-grpcio" + +SRC_URI[sha256sum] = "6e4ac2c43d76b245c5f66d98f523db08786b186128a655ee6f20a30a7e68e4f9" + +RDEPENDS:${PN} = "python3-grpcio" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.62.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.62.2.bb new file mode 100644 index 0000000000..478c5b33ec --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio-reflection_1.62.2.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Google gRPC reflection" +HOMEPAGE = "http://www.grpc.io/" +SECTION = "devel/python" + +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=7145f7cdd263359b62d342a02f005515" + +inherit pypi setuptools3 + +DEPENDS += "python3-grpcio" + +SRC_URI[sha256sum] = "2dd44806d68d0006636529bda573012b19a42281478c2d051cdaaebb91e2516c" + +RDEPENDS:${PN} = "python3-grpcio" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb index 59bfbf5538..fb91f345b0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.62.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-grpcio_1.66.1.bb @@ -13,7 +13,7 @@ SRC_URI += "file://0001-Include-missing-cstdint-header.patch \ file://0001-target.h-define-proper-macro-for-ppc-ppc64.patch \ file://0001-PR-1644-unscaledcycleclock-remove-RISC-V-support.patch \ " -SRC_URI[sha256sum] = "c77618071d96b7a8be2c10701a98537823b9c65ba256c0b9067e0594cdbd954d" +SRC_URI[sha256sum] = "35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2" RDEPENDS:${PN} = "python3-protobuf" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb index 9fd601c999..3c819a934d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_21.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-gunicorn_23.0.0.bb @@ -1,19 +1,21 @@ SUMMARY = "WSGI HTTP Server for UNIX" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=302423eeae97079c633da81b6a5fe35e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5b70a8b30792a916f50dc96123e61ddf" -SRC_URI[sha256sum] = "88ec8bff1d634f98e61b9f65bc4bf3cd918a90806c6f5c48bc5603849ec81033" +SRC_URI[sha256sum] = "f014447a0101dc57e294f6c18ca6b40227a4c90e9bdb586042628030cba004ec" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ " +# python-misc for wsgiref RDEPENDS:${PN}-ptest += " \ python3-eventlet \ python3-gevent \ + python3-misc \ python3-pytest \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb new file mode 100644 index 0000000000..8b3218790e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hatch-requirements-txt_0.4.1.bb @@ -0,0 +1,12 @@ +SUMMARY = "Hatchling plugin to read project dependencies from requirements.txt" +HOMEPAGE = "https://github.com/repo-helper/hatch-requirements-txt" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=58206c261591d2c13b00ab61cec32abe" + +SRC_URI[sha256sum] = "2c686e5758fd05bb55fa7d0c198fdd481f8d3aaa3c693260f5c0d74ce3547d20" + +PYPI_PACKAGE = "hatch_requirements_txt" + +inherit pypi python_hatchling + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb index e45ae79860..5fd5ddd71c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-haversine_2.8.1.bb @@ -1,6 +1,6 @@ SUMMARY = "Calculate the distance between 2 points on Earth" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://LICENSE;md5=20a52d2c688975e989fcbee3e6c8d1a1" SRC_URI[sha256sum] = "ab750caa0c8f2168bd7b00a429757a83a8393be1aa30f91c2becf6b523189e2a" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-hexbytes_1.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-hexbytes_1.2.1.bb index b75f7794ac..c8e34fc401 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-hexbytes_1.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-hexbytes_1.2.1.bb @@ -4,6 +4,12 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=16ffc86adf4293d4cfb204e77d62cfe6" -SRC_URI[sha256sum] = "965f1cc712e7b263c41fdf3fb36cf671ba6f59b895937cf33941a5c996ec3a5c" +SRC_URI[sha256sum] = "515f00dddf31053db4d0d7636dd16061c1d896c3109b8e751005db4ca46bcca7" inherit pypi setuptools3 + +RDEPENDS:${PN} += " \ + python3-core \ + python3-email \ + python3-compression \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.27.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.27.2.bb index e4d3cbeee8..e4e1eeea73 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.27.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-httpx_0.27.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE.md;md5=c624803bdf6fc1c4ce39f5ae11d7bd05" inherit pypi python_hatchling -SRC_URI[sha256sum] = "a0cb88a46f32dc874e04ee956e4c2764aba2aa228f650b06788ba6bda2962ab5" +SRC_URI[sha256sum] = "f7c2be1d2f3c3c3160d441802406b206c2b76f5947b11115e6df10c6c65e66c2" DEPENDS += "\ python3-hatch-fancy-pypi-readme-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb index c6e5606090..471fd6cc2a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-huey_2.5.1.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5cac039fcc82f01141cc170b48f315d4" PYPI_PACKAGE = "huey" -SRC_URI[sha256sum] = "2ffb52fb5c46a1b0d53c79d59df3622312b27e2ab68d81a580985a8ea4ca3480" +SRC_URI[sha256sum] = "8a323783ab434a095a4e72b8c48c5b8f957f9031fa860474a390a0927e957112" RDEPENDS:${PN} += " \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb index da1eea4cf7..a8668e1489 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.9.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-humanize_4.10.0.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENCE;md5=4ecc42519e84f6f3e23529464df7bd1d" -SRC_URI[sha256sum] = "582a265c931c683a7e9b8ed9559089dea7edcf6cc95be39a3cbc2c5d5ac2bcfa" +SRC_URI[sha256sum] = "06b6eb0293e4b85e8d385397c5868926820db32b9b654b932f57fa41c23c9978" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.35.1.bb index 45772ef8e1..6142884e72 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.34.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-imageio_2.35.1.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=24cb9a367a9e641b459a01c4d15256ba" -SRC_URI[sha256sum] = "f13eb76e4922f936ac4a7fec77ce8a783e63b93543d4ea3e40793a6cabd9ac7d" +SRC_URI[sha256sum] = "4952dfeef3c3947957f6d5dedb1f4ca31c6e509a476891062396834048aeed2a" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb new file mode 100644 index 0000000000..b81d173839 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-importlib-metadata_8.4.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "Read metadata from Python packages" +HOMEPAGE = "https://pypi.org/project/importlib-metadata/" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" + +inherit pypi python_setuptools_build_meta + +PYPI_PACKAGE = "importlib_metadata" +UPSTREAM_CHECK_REGEX = "/importlib-metadata/(?P<pver>(\d+[\.\-_]*)+)/" + +SRC_URI[sha256sum] = "9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5" + +S = "${WORKDIR}/importlib_metadata-${PV}" + +DEPENDS += "python3-setuptools-scm-native" +RDEPENDS:${PN} += "python3-zipp" +RDEPENDS:${PN}:append:class-target = " python3-misc" +RDEPENDS:${PN}:append:class-nativesdk = " python3-misc" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb deleted file mode 100644 index 503ef35a9e..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_22.10.0.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "Incremental is a small library that versions your Python projects" -HOMEPAGE = "https://github.com/twisted/incremental" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=6ca9b07f08e2c72d48c74d363d1e0e15" - -SRC_URI[sha256sum] = "912feeb5e0f7e0188e6f42241d2f450002e11bbc0937c65865045854c24c0bd0" - -inherit pypi python_setuptools_build_meta - -RDEPENDS:${PN} += " \ - python3-twisted-core \ - python3-click \ -" - -# -native is needed to build python[3]-twisted, however, we need to take steps to -# prevent a circular dependency. The build apparently does not use the part of -# python-incremental which uses python-twisted, so this hack is OK. -RDEPENDS:python3-incremental-native:remove = "python3-twisted-core-native" -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb new file mode 100644 index 0000000000..dc8ecb3302 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-incremental_24.7.2.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "Incremental is a small library that versions your Python projects" +HOMEPAGE = "https://github.com/twisted/incremental" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6ca9b07f08e2c72d48c74d363d1e0e15" + +SRC_URI[sha256sum] = "fb4f1d47ee60efe87d4f6f0ebb5f70b9760db2b2574c59c8e8912be4ebd464c9" + +inherit pypi python_setuptools_build_meta + +PACKAGE_BEFORE_PN = "\ + ${PN}-scripts \ + ${PN}-tests \ +" + +FILES:${PN}-scripts = "\ + ${PYTHON_SITEPACKAGES_DIR}/incremental/update.py \ + ${PYTHON_SITEPACKAGES_DIR}/incremental/__pycache__/update*.pyc \ +" + +RDEPENDS:${PN}-scripts = "\ + python3-click \ +" + +FILES:${PN}-tests = "${PYTHON_SITEPACKAGES_DIR}/incremental/tests" + +# The tests require unit testing tool 'trial' from the twisted package +RDEPENDS:${PN}-tests = "\ + ${PN}-scripts \ + python3-twisted \ +" + +BBCLASSEXTEND = "native" + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch new file mode 100644 index 0000000000..5391a11da0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64/0001-Do-not-override-const-qualifier.patch @@ -0,0 +1,83 @@ +From 7e3a795cbeea94b3324aa926f2b11904cb169acc Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Jul 2024 22:02:38 -0700 +Subject: [PATCH] Do not override 'const' qualifier + +This has worked so far but with fortified system headers from +Glibc 2.40+ and clang compiler it ends up in compile errors + +| In file included from /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/string.h:548: +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:77:66: error: pass_object_size attribute only applies to constant pointer arguments +| 77 | __NTH (strcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:86:66: error: pass_object_size attribute only applies to constant pointer arguments +| 86 | __NTH (stpcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:96:67: error: pass_object_size attribute only applies to constant pointer arguments +| 96 | __NTH (strncpy (__fortify_clang_overload_arg (char *, __restrict, __dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:107:56: error: pass_object_size attribute only applies to constant pointer arguments +| 107 | __NTH (stpncpy (__fortify_clang_overload_arg (char *, ,__dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:136:66: error: pass_object_size attribute only applies to constant pointer arguments +| 136 | __NTH (strcat (__fortify_clang_overload_arg (char *, __restrict, __dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:145:67: error: pass_object_size attribute only applies to constant pointer arguments +| 145 | __NTH (strncat (__fortify_clang_overload_arg (char *, __restrict, __dest), +| | ^ +| /mnt/b/yoe/master/build/tmp/work/riscv64-yoe-linux/python3-inflate64/1.0.0/recipe-sysroot/usr/include/bits/string_fortified.h:161:67: error: pass_object_size attribute only applies to constant pointer arguments +| 161 | __NTH (strlcpy (__fortify_clang_overload_arg (char *, __restrict, __dest), + +Therefore adjust needed places to use const qualifier + +Upstream-Status: Submitted [https://codeberg.org/miurahr/inflate64/pulls/13] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lib/deflate.h | 2 +- + src/lib/deflate_tree.c | 4 ++-- + src/lib/inflate64_config.h | 3 --- + 3 files changed, 3 insertions(+), 6 deletions(-) + +diff --git a/src/lib/deflate.h b/src/lib/deflate.h +index 72a324f..c780be9 100644 +--- a/src/lib/deflate.h ++++ b/src/lib/deflate.h +@@ -288,6 +288,6 @@ void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, char FAR *buf, + extern const unsigned char ZLIB_INTERNAL _dist_code[]; + #endif + #endif +-extern uch ZLIB_INTERNAL length_code[]; ++extern const uch ZLIB_INTERNAL length_code[]; + + #endif /* DEFLATE_H */ +diff --git a/src/lib/deflate_tree.c b/src/lib/deflate_tree.c +index 5a66139..cdee934 100644 +--- a/src/lib/deflate_tree.c ++++ b/src/lib/deflate_tree.c +@@ -78,10 +78,10 @@ local const uch bl_order[BL_CODES] + + #define DIST_CODE_LEN 768 /* see definition of array dist_code below */ + +-local int base_length[LENGTH_CODES]; ++local const int base_length[LENGTH_CODES]; + /* First normalized length for each code (0 = MIN_MATCH) */ + +-uch length_code[BASE_MATCH-MIN_MATCH+1]; ++const uch length_code[BASE_MATCH-MIN_MATCH+1]; + /* length code for each normalized match length (0 == MIN_MATCH) */ + + #if defined(GEN_TREES_H) || !defined(STDC) +diff --git a/src/lib/inflate64_config.h b/src/lib/inflate64_config.h +index 16cfd12..ade7300 100644 +--- a/src/lib/inflate64_config.h ++++ b/src/lib/inflate64_config.h +@@ -53,9 +53,6 @@ + # define FAR + #endif + +-#ifndef const +-# define const +-#endif + #define z_const const + + typedef unsigned char uch; diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb index 2ccc98e36b..7804152d94 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-inflate64_1.0.0.bb @@ -4,11 +4,12 @@ LICENSE = "LGPL-2.1-or-later" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -inherit setuptools3 pypi +inherit python_setuptools_build_meta pypi +SRC_URI += "file://0001-Do-not-override-const-qualifier.patch" SRC_URI[sha256sum] = "3278827b803cf006a1df251f3e13374c7d26db779e5a33329cc11789b804bc2d" -PYPI_PACKAGE = "inflate64" +DEPENDS += "python3-setuptools-scm-native" RDEPENDS:${PN} += "\ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.25.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb index 2e2d0e1c51..94e731b88a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.25.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ipython_8.27.0.bb @@ -3,9 +3,7 @@ HOMEPAGE = "https://ipython.org" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING.rst;md5=59b20262b8663cdd094005bddf47af5f" -PYPI_PACKAGE = "ipython" - -SRC_URI[sha256sum] = "c6ed726a140b6e725b911528f80439c534fac915246af3efc39440a6b0f9d716" +SRC_URI[sha256sum] = "0b99a2dc9f15fd68692e898e5568725c6d49c527d36a9fb5960ffbdeaa82ff7e" RDEPENDS:${PN} = "\ python3-setuptools \ @@ -25,4 +23,4 @@ RDEPENDS:${PN} = "\ python3-stack-data \ " -inherit setuptools3 pypi +inherit python_setuptools_build_meta pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.2.0.bb index 5af1d594b3..f4d8d52967 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.1.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-itsdangerous_2.2.0.bb @@ -1,11 +1,11 @@ SUMMARY = "Various helpers to pass trusted data to untrusted environments and back." HOMEPAGE = "http://github.com/mitsuhiko/itsdangerous" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=4cda9a0ebd516714f360b0e9418cfb37" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4cda9a0ebd516714f360b0e9418cfb37" -SRC_URI[sha256sum] = "5dbbc68b317e5e42f327f9021763545dc3fc3bfe22e6deb96aaf1fc38874156a" +SRC_URI[sha256sum] = "e0050c0b7da1eea53ffaf149c0cfbb5c6e2e2b69c4bef22c81fa6eb73e5f6173" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta CLEANBROKEN = "1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb index 13d2a448db..399ccd22e9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-joblib_1.4.2.bb @@ -2,7 +2,7 @@ SUMMARY = "Joblib is a set of tools to provide lightweight pipelining in Python. LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2e481820abf0a70a18011a30153df066" -inherit setuptools3 pypi +inherit python_setuptools_build_meta pypi SRC_URI[sha256sum] = "2382c5816b2636fbd20a09e0f4e9dad4736765fdfb7dca582943b9c1366b3f0e" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb index 991aa0f7d8..045ac23106 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kivy_2.3.0.bb @@ -70,3 +70,15 @@ RDEPENDS:${PN} = " \ python3-pillow \ python3-pygments \ " + +# http://errors.yoctoproject.org/Errors/Details/766917/ +# python3-kivy/2.3.0/git/kivy/graphics/cgl_backend/cgl_gl.c:4568:52: error: assignment to 'void (*)(GLuint, GLsizei, const GLchar **, const GLint *)' {aka 'void (*)(unsigned int, int, const char **, const int *)'} from incompatible pointer type 'void (*)(GLuint, GLsizei, const GLchar * const*, const GLint *)' {aka 'void (*)(unsigned int, int, const char * const*, const int *)'} [-Wincompatible-pointer-types] +# python3-kivy/2.3.0/git/kivy/core/window/_window_sdl2.c:8781:23: error: passing argument 1 of 'SDL_SetEventFilter' from incompatible pointer type [-Wincompatible-pointer-types] +CFLAGS += "-Wno-error=incompatible-pointer-types" + +do_compile:append() { + for f in `find ${B} -name *.c` + do + sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f + done +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.7.bb index a1949b1138..9c422490ef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-kiwisolver_1.4.7.bb @@ -1,9 +1,9 @@ SUMMARY = "A fast implementation of the Cassowary constraint solver" HOMEPAGE = "https://github.com/nucleic/kiwi" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=f137eeae9cf8004d06830f6ab25b2d52" +LIC_FILES_CHKSUM = "file://LICENSE;md5=5f7ce5ba663b186ce35b78df96a2eb0a" -SRC_URI[sha256sum] = "e57e563a57fb22a142da34f38acc2fc1a5c864bc29ca1517a88abc963e60d6ec" +SRC_URI[sha256sum] = "9893ff81bd7107f7b685d3017cc6583daadb4fc26e4a888350df530e41980a60" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.68.bb index 26a4f19215..64eb57dd38 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.66.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-langtable_0.0.68.bb @@ -6,7 +6,7 @@ SECTION = "devel/python" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI[sha256sum] = "0679e9014aa25916a8184c7bb5082fe983a661ab958d37f5fb75461abf5fb342" +SRC_URI[sha256sum] = "3965a4d57a066a595ea8a87f6a5295412e65a7f39dbaad95c7327d48b11799fe" inherit pypi setuptools3 python3native diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb index 263c46869f..195f94705b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy-object-proxy_1.10.0.bb @@ -4,8 +4,8 @@ LICENSE = "BSD-2-Clause" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=d606e94f56c21c8e0cdde0b622dcdf57" -DEPENDS += "python3-setuptools-scm-native python3-pip-native" +DEPENDS += "python3-setuptools-scm-native" SRC_URI[sha256sum] = "78247b6d45f43a52ef35c25b5581459e85117225408a4128a3daf8bf9648ac69" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.6.bb index 97517f89a6..222489302d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lazy_1.6.bb @@ -5,4 +5,4 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=7df3865e8640604acfa474235d2db76b" SRC_URI[sha256sum] = "7127324ec709e8324f08cb4611c1abe01776bda53bb9ce68dc5dfa46ca0ed3e9" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb index 27e336710c..5ad2a59951 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-libevdev_0.11.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://gitlab.freedesktop.org/libevdev/python-libevdev" SECTION = "devel/python" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING;md5=d94c10c546b419eddc6296157ec40747" SRC_URI[md5sum] = "34b48098c1fba26de79a0d67a17a588a" SRC_URI[sha256sum] = "e9ca006a4df2488a60bd9a740011ee948d81904be2364f017e560169508f560f" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb index e9535fa6f1..236daca490 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-lru-dict_1.3.0.bb @@ -1,11 +1,9 @@ -SUMMARY = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." +DESCRIPTION = "A fixed size dict like container which evicts Least Recently Used (LRU) items once size limit is exceeded." HOMEPAGE = "https://github.com/amitdev/lru-dict" SECTION = "devel/python" -LICENSE = "BSD-3-Clause" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=9d10a486ee04034fdef5162fd791f153" SRC_URI[sha256sum] = "54fd1966d6bd1fcde781596cb86068214edeebff1db13a2cea11079e3fd07b6b" -inherit pypi setuptools3 - -SRC_URI += "${PYPI_SRC_URI}" +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb index 95f066affe..74b9be5023 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-luma-oled_3.13.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/rm-hull/luma.oled" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5ec447eb69733e20a55838de7e8cb991" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "7e2a0d6a4c968c64980255d681ec27914d9abd5a66a9019b289bf3ad050c2125" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.22.0.bb index 11351230c2..269522dcea 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.21.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-marshmallow_3.22.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "\ file://LICENSE;md5=27586b20700d7544c06933afe56f7df4 \ file://docs/license.rst;md5=13da439ad060419fb7cf364523017cfb" -SRC_URI[sha256sum] = "82408deadd8b33d56338d2182d455db632c6313aa2af61916672146bb32edc56" +SRC_URI[sha256sum] = "4972f529104a220bb8637d595aa4c9762afbe7f7a77d82dc58c1615d70c5823e" inherit python_flit_core pypi ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.7.bb index 13210b9060..335565643a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-matplotlib-inline_0.1.7.bb @@ -3,6 +3,9 @@ HOMEPAGE = "https://pypi.org/project/matplotlib-inline/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=d4692a0eb42ca54892399db2cb35e61e" -SRC_URI[sha256sum] = "f887e5f10ba98e8d2b150ddcf4702c1e5f8b3a20005eb0f74bfdbd360ee6f304" +SRC_URI[sha256sum] = "8423b23ec666be3d16e16b60bdd8ac4e86e840ebd1dd11a30b9f117f2fa0ab90" -inherit pypi +PYPI_PACKAGE = "matplotlib_inline" +inherit pypi python_setuptools_build_meta + +RDEPENDS:${PN} = "python3-traitlets" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb index d9ecb9d4c8..1b89260e1b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-mock_5.1.0.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A Python Mocking and Patching Library for Testing" HOMEPAGE = "https://pypi.python.org/pypi/mock" SECTION = "devel/python" -LICENSE = "Apache-2.0" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=de9dfbf780446b18aab11f00baaf5b7e" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.70.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.72.bb index 7e77d8f7ae..be560c7180 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.70.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-moteus_0.3.72.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://setup.py;beginline=3;endline=9;md5=24025d3c660abfc62a inherit pypi setuptools3 -SRC_URI[sha256sum] = "39e6e2689511c601dff62e502ca6c6ab91100f34b2ebbf52fcee241bf8bfed31" +SRC_URI[sha256sum] = "3aa30eea9ab9bc7209ab7c6f382650265ab648663edead5c54d69d9f0a3fd36e" S = "${WORKDIR}/moteus-${PV}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.1.0.bb index a000737f42..eb04dc2e0f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.0.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-msgpack_1.1.0.bb @@ -2,9 +2,9 @@ SUMMARY = "MessagePack (de)serializer" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=cd9523181d9d4fbf7ffca52eaa2a5751" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest -SRC_URI[sha256sum] = "95c02b0e27e706e48d0e5426d1710ca78e0f0628d6e89d5b5a5b91a5f12274f3" +SRC_URI[sha256sum] = "dd432ccc2c72b914e4cb77afce64aab761c1137cc698be3984eee260bcb2896e" RDEPENDS:${PN}:class-target += "\ python3-io \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb index b12e180d02..6346152aec 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-multidict_6.0.5.bb @@ -4,7 +4,7 @@ HOMEPAGE = "https://github.com/aio-libs/multidict/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=b4fef6e4b0828c2401fb983363985b39" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest PV .= "+git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb index 5fe9ab4e39..25e382088b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nmap_1.9.1.bb @@ -1,14 +1,14 @@ DESCRIPTION = "python-nmap is a python library which helps in using nmap port scanner" HOMEPAGE = "https://www.nmmapper.com/" SECTION = "devel/python" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LICENSE = "GPL-3.0-only" +LIC_FILES_CHKSUM = "file://LICENSE;md5=1ebbd3e34237af26da5dc08a4e440464" DEPENDS += "python3-wheel-native" PYPI_PACKAGE = "python3-nmap" -SRC_URI[sha256sum] = "892b5091cde429fabfb8ba63382b2db8fd795193ba147558d0a7d5534c956255" +SRC_URI[sha256sum] = "8465cfb013f5cdfa8a1050c40cdae600b581ee32f1864ec404927aee49b4262c" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.4.bb index 105c20b5a8..31bd15f8b9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocasedict_2.0.4.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/pywbem/nocasedict" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" -SRC_URI[sha256sum] = "1c9226c7f5a8a97ad51dcb0ae3157a720e3f7cb9c4568d22ea3a05e3f85658a9" +SRC_URI[sha256sum] = "4ca934f65df57b10d0fcab5f0c39e9dccb93577ff9f22bef98265ddbf12f8af1" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.3.bb index 913b8ac5ed..a869453875 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-nocaselist_2.0.3.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://nocaselist.readthedocs.io/en/latest/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "32708b700a1a53133e6bb5cc53332c9775b0c7c959a5f9725793171fd2f4c8a5" +SRC_URI[sha256sum] = "55714da8433fb4843ce797404977e4385d5e3df9e4aa00f7dde983fd87410fef" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-oletools_0.60.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-oletools_0.60.2.bb index fbb7955d6f..162ebcab2d 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-oletools_0.60.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-oletools_0.60.2.bb @@ -1,9 +1,9 @@ SUMMARY = "Python tools to analyze security characteristics of MS Office and OLE files" HOMEPAGE = "https://github.com/decalage2/olefile" LICENSE = "BSD-2-Clause" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=181754d317256f1b037529d3e994e1b4" -SRC_URI[sha256sum] = "67a796da4c4b8e2feb9a6b2495bef8798a3323a75512de4e5669d9dc9d1fae31" +SRC_URI[sha256sum] = "ad452099f4695ffd8855113f453348200d195ee9fa341a09e197d66ee7e0b2c3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.5.bb index 934bf319bc..990d3cf33e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-openpyxl_3.1.5.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148 inherit pypi setuptools3 -SRC_URI[sha256sum] = "8dd482e5350125b2388070bb2477927be2e8ebc27df61178709bc8c8751da2f9" +SRC_URI[sha256sum] = "cf0e3cf56142039133628b5acffe8ef0c12bc902d2aadd3e0fe5878dc08d1050" RDEPENDS:${PN} += "\ python3-compression \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_2.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_2.1.0.bb index e4cf77a134..0c3e6e9266 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_2.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paho-mqtt_2.1.0.bb @@ -7,9 +7,9 @@ SRCNAME = "paho-mqtt" inherit pypi python_hatchling python_setuptools_build_meta -SRC_URI[sha256sum] = "13b205f29251e4f2c66a6c923c31fc4fd780561e03b2d775cff8e4f2915cf947" +SRC_URI[sha256sum] = "12d6e7511d4137555a3f6ea167ae846af2c7357b10bc6fa4f7c3968fc1723834" -PYPI_SRC_URI = "https://files.pythonhosted.org/packages/73/b7/a4df0f93bbdae237e16ba402752151eceee576cbe80c235a2475fbf81eea/paho_mqtt-${PV}.tar.gz" +PYPI_SRC_URI = "https://files.pythonhosted.org/packages/39/15/0a6214e76d4d32e7f663b109cf71fb22561c2be0f701d67f93950cd40542/paho_mqtt-${PV}.tar.gz" S = "${WORKDIR}/paho_mqtt-${PV}" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch new file mode 100644 index 0000000000..b0ef8ce00c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch @@ -0,0 +1,27 @@ +From d81d95274d84ac51fc02e0fa91affc7f3cbefccb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 24 Aug 2024 10:21:43 -0700 +Subject: [PATCH] pyproject.toml: Downgrade numpy version needs to 1.x + +Drop it when numpy is upgraded to 2.x or newer in core + +Upstream-Status: Inappropriate [OE workaround] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 5158d60..d3daa78 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -8,7 +8,7 @@ requires = [ + "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json + # Force numpy higher than 2.0rc1, so that built wheels are compatible + # with both numpy 1 and 2 +- "numpy>=2.0.0rc1", ++ "numpy>=1.24.0", + "versioneer[toml]" + ] + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch new file mode 100644 index 0000000000..f60f43a5b0 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas/0001-pyproject.toml-don-t-pin-dependency-versions.patch @@ -0,0 +1,37 @@ +From d46b8720a6bccb345f6bdd7ee2f5c357e7eb227b Mon Sep 17 00:00:00 2001 +From: Trevor Gamblin <tgamblin@baylibre.com> +Date: Mon, 12 Aug 2024 11:27:36 -0400 +Subject: [PATCH] pyproject.toml: don't pin dependency versions + +Pandas will fail to build if the exact versions aren't found, but newer +ones actually work. Since newer versions of pandas are adjusting the +requires section of pyproject toml further, just patch it for us. + +Upstream-Status: Inappropriate [OE-Specific] + +Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> +--- + pyproject.toml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/pyproject.toml b/pyproject.toml +index db9f055799..5158d60f59 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -2,10 +2,10 @@ + # Minimum requirements for the build system to execute. + # See https://github.com/scipy/scipy/pull/12940 for the AIX issue. + requires = [ +- "meson-python==0.13.1", +- "meson==1.2.1", ++ "meson-python>=0.13.1", ++ "meson>=1.2.1", + "wheel", +- "Cython==3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json ++ "Cython>=3.0.5", # Note: sync with setup.py, environment.yml and asv.conf.json + # Force numpy higher than 2.0rc1, so that built wheels are compatible + # with both numpy 1 and 2 + "numpy>=2.0.0rc1", +-- +2.39.2 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb index 91e76d9919..25b03c8e32 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.0.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pandas_2.2.2.bb @@ -6,9 +6,14 @@ HOMEPAGE = "http://pandas.pydata.org/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=cb819092901ddb13a7d0a4f5e05f098a" -SRC_URI[sha256sum] = "c02f372a88e0d17f36d3093a644c73cfc1788e876a7c4bcb4020a77512e2043c" +SRC_URI += " \ + file://0001-pyproject.toml-don-t-pin-dependency-versions.patch \ + file://0001-pyproject.toml-Downgrade-numpy-version-needs-to-1.x.patch \ + " -inherit pypi setuptools3 +SRC_URI[sha256sum] = "9e79019aba43cb4fda9e4d983f8e88ca0373adbb697ae9c6c43093218de28b54" + +inherit pypi python_mesonpy DEPENDS += " \ python3-cython-native \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb index 0d32d361cf..8ccf939f7a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-paramiko_3.5.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/paramiko/paramiko/" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fd0120fc2e9f841c73ac707a30389af5" -SRC_URI[sha256sum] = "aac08f26a31dc4dffd92821527d1682d99d52f9ef6851968114a8728f3c274d3" +SRC_URI[sha256sum] = "ad11e540da4f55cedda52931f1a3f812a8238a7af7f62a60de538cd80bb28124" PYPI_PACKAGE = "paramiko" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.3.bb index a7d8cd86ce..06843c03cb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse-type_0.6.3.bb @@ -1,25 +1,25 @@ SUMMARY = "Simplifies building parse types based on the parse module" HOMEPAGE = "https://github.com/jenisys/parse_type" -LICENSE = "BSD-3-Clause" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2e469278ace89c246d52505acc39c3da" -SRC_URI[sha256sum] = "79b1f2497060d0928bc46016793f1fca1057c4aacdf15ef876aa48d75a73a355" +SRC_URI[sha256sum] = "8e99d2f52fab2f0f1f3d68ba9d026060140bf0e53680aada0111fb27b2f0e93a" +SRC_URI += " \ + file://run-ptest \ +" PYPI_PACKAGE = "parse_type" -inherit pypi ptest setuptools3 -RDEPENDS:${PN} += "python3-parse" +inherit pypi ptest python_setuptools_build_meta -SRC_URI += " \ - file://run-ptest \ -" +do_install_ptest() { + install -d ${D}${PTEST_PATH}/tests + cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ +} +RDEPENDS:${PN} += "python3-parse" RDEPENDS:${PN}-ptest += " \ python3-pytest \ + python3-six \ python3-unittest-automake-output \ " - -do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/* ${D}${PTEST_PATH}/tests/ -} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb index d2b91b3f30..6e7139bfbe 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-parse_1.20.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/r1chardj0n3s/parse" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=8ab458ad281b60e6f1b39b3feafbfc05" -SRC_URI[sha256sum] = "09002ca350ad42e76629995f71f7b518670bcf93548bdde3684fd55d2be51975" +SRC_URI[sha256sum] = "b41d604d16503c79d81af5165155c0b20f6c8d6c559efa66b4b695c3e5a0a0ce" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb index 27f32bf1af..e3405939c7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pastedeploy_3.1.0.bb @@ -3,19 +3,22 @@ HOMEPAGE = "https://pylonsproject.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://license.txt;md5=1798f29d55080c60365e6283cb49779c" -inherit pypi +inherit pypi python_setuptools_build_meta + PYPI_PACKAGE = "PasteDeploy" SRC_URI[sha256sum] = "9ddbaf152f8095438a9fe81f82c78a6714b92ae8e066bed418b6a7ff6a095a95" -S = "${WORKDIR}/PasteDeploy-${PV}" - -inherit setuptools3 - # Uncomment this line to enable all the optional features. #PACKAGECONFIG ?= "paste docs" PACKAGECONFIG[paste] = ",,,python3-paste" PACKAGECONFIG[docs] = ",,,python3-sphinx python3-pylons-sphinx-themes" -DEPENDS= "python3 python3-setuptools-scm-native python3-pytest-runner-native" -RDEPENDS:${PN} += "python3-core python3-misc python3-netclient python3-pkgutil python3-setuptools python3-threading python3-core" +RDEPENDS:${PN} += " \ + python3-core \ + python3-misc \ + python3-netclient \ + python3-pkgutil \ + python3-setuptools \ + python3-threading \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.14.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-path_17.0.0.bb index b4d290a230..e809952079 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-path_16.14.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-path_17.0.0.bb @@ -2,7 +2,7 @@ SUMMARY = "A module wrapper for os.path" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=141643e11c48898150daa83802dbc65f" -SRC_URI[sha256sum] = "dbaaa7efd4602fd6ba8d82890dc7823d69e5de740a6e842d9919b0faaf2b6a8e" +SRC_URI[sha256sum] = "e1540261d22df1416fb1b498b3b1ed5353a371a48fe197d66611bb01e7fab2d5" SRC_URI += "\ file://run-ptest \ @@ -28,7 +28,7 @@ BBCLASSEXTEND = "nativesdk native" do_install_ptest() { install -d ${D}${PTEST_PATH}/test - cp -rf ${S}/test_* ${D}${PTEST_PATH}/test/ + cp -rf ${S}/tests/test_* ${D}${PTEST_PATH}/test/ install -d ${D}${PTEST_PATH}/path cp -rf ${S}/path/* ${D}${PTEST_PATH}/path/ } diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb new file mode 100644 index 0000000000..d4de40893a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pathlib2_2.3.7.bb @@ -0,0 +1,12 @@ +SUMMARY = "Object-oriented filesystem paths" +HOMEPAGE = "https://github.com/mcmtroffaes/pathlib2" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=2dc08586cce3ab91bfa091b655c0e440" + +SRC_URI[sha256sum] = "7a4329d67beff9a712e1d3ae147e4e3e108b0bfd284ffdea03a635126c76b3c0" + +inherit pypi setuptools3 + +RDEPENDS:${PN} += "python3-six python3-ctypes" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.1.bb index 4185f78587..f2175150e8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-backend_2.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-backend_2.4.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=4a564297b3c5b629a528b92fd8ff61ea" -SRC_URI[sha256sum] = "e39ed2da206d90d4a6e9eb62f6dce54ed4fa65ddf172a7d5700960d0f8a09e09" +SRC_URI[sha256sum] = "d6404e94a612459c5213cc63df035711244173c57441b8312a2a6f4a8c110934" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb new file mode 100644 index 0000000000..f20f11ff44 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm-build-locked_0.3.3.bb @@ -0,0 +1,13 @@ +SUMMARY = "pdm plugin to publish locked dependencies as optional-dependencies" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=19382cdf9c143df4f00b9caa0b60c75a" + +SRC_URI[sha256sum] = "b784135abf62b93ce0a11332ee24723a2699b7f266fddb7950a5b70c93df6214" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " python3-pdm-backend-native" + +PYPI_PACKAGE = "pdm_build_locked" + +BBCLASSEXTEND += "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.15.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.19.1.bb index 364c7c81e9..245e76014e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.15.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pdm_2.19.1.bb @@ -4,12 +4,13 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=2eb31a2cc1a758c34b499f287dd04ef2" -SRC_URI[sha256sum] = "58e225850567dcadce42418db4638996df2b1378cd0830cd48afda1b455d9c72" +SRC_URI[sha256sum] = "7fe235a9cb27b7ec17b762dc85bc9ae71e0776e4b7a8b6f64203f24bb915aa2c" inherit pypi python_setuptools_build_meta DEPENDS += " \ python3-pdm-backend-native \ + python3-pdm-build-locked-native \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch index e4ba35b886..220c4edc3f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow/0001-support-cross-compiling.patch @@ -1,4 +1,4 @@ -From cd09b6f68aa49c72e9a9bb0765e8c666238a7b7e Mon Sep 17 00:00:00 2001 +From 5b28d19d6513cc3eb3105d3f917df352283f3c5e Mon Sep 17 00:00:00 2001 From: Leon Anavi <leon.anavi@konsulko.com> Date: Mon, 11 Jan 2021 13:25:12 +0000 Subject: [PATCH] support cross compiling @@ -12,10 +12,10 @@ Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/setup.py b/setup.py -index cbc2641c..302bc6e7 100755 +index 0abfaaddc..557420a6b 100644 --- a/setup.py +++ b/setup.py -@@ -123,7 +123,7 @@ _LIB_IMAGING = ( +@@ -129,7 +129,7 @@ _LIB_IMAGING = ( "codec_fd", ) @@ -24,7 +24,7 @@ index cbc2641c..302bc6e7 100755 class DependencyException(Exception): -@@ -408,12 +408,12 @@ class pil_build_ext(build_ext): +@@ -508,12 +508,12 @@ class pil_build_ext(build_ext): _add_directory(library_dirs, match.group(1)) # include, rpath, if set as environment variables: @@ -39,6 +39,3 @@ index cbc2641c..302bc6e7 100755 if k in os.environ: for d in os.environ[k].split(os.path.pathsep): _add_directory(library_dirs, d) --- -2.17.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.4.0.bb index debf488154..a9cb903ac1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pillow_10.4.0.bb @@ -1,15 +1,15 @@ -SUMMARY = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ +DESCRIPTION = "Python Imaging Library (Fork). Pillow is the friendly PIL fork by Alex \ Clark and Contributors. PIL is the Python Imaging Library by Fredrik Lundh and \ Contributors." HOMEPAGE = "https://pillow.readthedocs.io" -LICENSE = "MIT" +LICENSE = "HPND" LIC_FILES_CHKSUM = "file://LICENSE;md5=c349a4b4b9ec2377a8fd6a7df87dbffe" SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https \ file://0001-support-cross-compiling.patch \ file://run-ptest \ " -SRCREV = "5c89d88eee199ba53f64581ea39b6a1bc52feb1a" +SRCREV = "9b4fae77178e827ab17118fbc89c739ffd6a0fab" inherit python_setuptools_build_meta ptest @@ -41,12 +41,13 @@ RDEPENDS:${PN} += " \ python3-numbers \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxcb', '', d)} \ " - +# python3-compile for filecmp module RDEPENDS:${PN}-ptest += " \ bash \ ghostscript \ jpeg-tools \ libwebp \ + python3-compile \ python3-core \ python3-image \ python3-mmap \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint/run-ptest index 5cec711696..8d2017d39c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb index 370cd7017b..23e9fdb0e2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.23.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pint_0.24.3.bb @@ -6,14 +6,11 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=bccf824202692270a1e0829a62e3f47b" -PYPI_PACKAGE := "Pint" +PYPI_PACKAGE = "pint" -inherit ptest python_setuptools_build_meta +inherit pypi ptest python_setuptools_build_meta -SRCREV = "f2e4081aee38f850938048beac7fb69c4908bc5e" -SRC_URI = "git://github.com/hgrecco/pint;protocol=https;branch=master" -S = "${WORKDIR}/git" -#SRC_URI[sha256sum] = "e1509b91606dbc52527c600a4ef74ffac12fff70688aff20e9072409346ec9b4" +SRC_URI[sha256sum] = "d54771093e8b94c4e0a35ac638c2444ddf3ef685652bab7675ffecfa0c5c5cdf" DEPENDS += "python3-setuptools-scm-native" @@ -27,12 +24,18 @@ RDEPENDS:${PN} += " \ python3-setuptools \ python3-packaging \ " - +# python3-misc for timeit.py RDEPENDS:${PN}-ptest += " \ python3-appdirs \ + python3-attrs \ python3-flexcache \ python3-flexparser \ + python3-misc \ python3-pytest \ + python3-pytest-benchmark \ + python3-pytest-subtests \ + python3-statistics \ + python3-unittest-automake-output \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb index 5821aedd4f..02d8c3cec7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-platformdirs_4.3.6.bb @@ -1,13 +1,13 @@ SUMMARY = "A small Python module for determining appropriate platform-specific dirs" HOMEPAGE = "https://github.com/platformdirs/platformdirs" -LICENSE = "BSD-3-Clause" +LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ea4f5a41454746a9ed111e3d8723d17a" SRC_URI += " \ file://run-ptest \ " -SRC_URI[sha256sum] = "38b7b51f512eed9e84a22788b4bce1de17c0adb134d6becb09836e37d8654cd3" +SRC_URI[sha256sum] = "357fb2acbc885b0419afd3ce3ed34564c13c9b95c89360cd9563f73aa5e2b907" inherit pypi python_hatchling ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb index 3af94b48f1..a5e26f302b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-portion_2.4.2.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "LGPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=05f1e16a8e59ce3e9a979e881816c2ab" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta SRC_URI[sha256sum] = "5289b40d98959b16b3f6927781678935d3df1b7c14947f5d7778e5e04dd9a065" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.11.0.bb index 35e9ab1798..df11141a5a 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prettytable_3.11.0.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c9a6829fcd174d9535b46211917c7671" -SRC_URI[sha256sum] = "9665594d137fb08a1117518c25551e0ede1687197cf353a4fdc78d27e1073568" +SRC_URI[sha256sum] = "7e23ca1e68bbfd06ba8de98bf553bf3493264c96d5e8a615c0471025deeba722" SRC_URI += " \ file://run-ptest \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.45.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb index e02aafdb98..9997785dcd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.45.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-prompt-toolkit_3.0.47.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-prompt-toolkit.readthedocs.io/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=b2cde7da89f0c1f3e49bf968d00d554f" -SRC_URI[sha256sum] = "07c60ee4ab7b7e90824b61afa840c8f5aad2d46b3e2e10acc33d8ecc94a49089" +SRC_URI[sha256sum] = "1e1b29cb58080b1e69f207c893a1a7bf16d127a5c30c9d17a25a5d77792e5360" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb index b9b03badd0..c7e1f3c3f2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-protobuf_4.25.3.bb @@ -17,6 +17,7 @@ UPSTREAM_CHECK_REGEX = "protobuf/(?P<pver>\d+(\.\d+)+)/" DEPENDS += "protobuf" RDEPENDS:${PN} += " \ + python3-ctypes \ python3-datetime \ python3-json \ python3-logging \ @@ -35,3 +36,11 @@ DISTUTILS_INSTALL_ARGS += "--cpp_implementation" do_compile:prepend:class-native () { export KOKORO_BUILD_NUMBER="1" } + +do_install:append () { + # Remove useless and problematic .pth file. python3-protobuf is installed in the standard + # location of site packages. No need for such .pth file. + # NOTE: do not drop this removal until the following issue in upstream cpython is resolved: + # https://github.com/python/cpython/issues/122220 + rm -f ${D}${PYTHON_SITEPACKAGES_DIR}/protobuf-*-nspkg.pth +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_24.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_24.8.0.bb index 3bc15bb08a..580d41d0cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_24.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pulsectl_24.8.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/mk-fg/python-pulse-control" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=f1d10048469ff90123263eb5e214061d" -SRC_URI[sha256sum] = "697ed50e7d452e78678ae38e2ab935843008bec448955283cd0fb362867e3165" +SRC_URI[sha256sum] = "b051506d0d73d3cc4357cefd3de17bb859d7ecf004e994b0f7cfa87851bc7156" RDEPENDS:${PN} += " \ libpulse \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.3.bb index 66e4673a70..f52b235e8f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pure-eval_0.2.3.bb @@ -8,7 +8,7 @@ PYPI_PACKAGE = "pure_eval" inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "2b45320af6dfaa1750f543d714b6d1c520a1688dec6fd24d339063ce0aaa9ac3" +SRC_URI[sha256sum] = "5f4e983f40564c576c7c8635ae88db5956bb2229d7e9237d03b3c0b0190eaf42" RDEPENDS:${PN} += " \ python3-datetime \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb index 857afd1db7..2d59a99b14 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py-cpuinfo_9.0.0.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d2379ecb0d7a8299101b1e4c160cd1f7" SRC_URI[sha256sum] = "3cdbbf3fac90dc6f118bfd64384f309edeadd902d7c8fb17f02ffa1fc3f49690" -inherit ptest pypi setuptools3 +inherit ptest pypi python_setuptools_build_meta SRC_URI += "file://run-ptest \ file://0001-test_cli.py-disable.patch \ @@ -27,6 +27,7 @@ do_install_ptest() { } RDEPENDS:${PN}-ptest += "\ + python3-compile \ python3-pytest \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.21.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.22.0.bb index cb405a535d..c5cf1e8362 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.21.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py7zr_0.22.0.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL-2.1-or-later" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[sha256sum] = "213a9cc46940fb8f63b4163643a8f5b36bbc798134746c3992d3bc6b14edab87" +SRC_URI[sha256sum] = "c6c7aea5913535184003b73938490f9a4d8418598e533f9ca991d3b8e45a139e" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.11.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.11.0.bb new file mode 100644 index 0000000000..31d5a377a7 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-py_1.11.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Library with cross-python path, ini-parsing, io, code, log facilities" +HOMEPAGE = "http://py.readthedocs.io/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6bb0320b04a0a503f12f69fea479de9" + +SRC_URI[sha256sum] = "51c75c4126074b472f746a24399ad32f6053d1b34b68d2fa41e558e6f4a98719" + +DEPENDS += "python3-setuptools-scm-native" + +inherit pypi python_setuptools_build_meta + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += "python3-netclient" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb index 34f3639e53..e8c0f960aa 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyasn1-modules_0.4.1.bb @@ -6,11 +6,11 @@ HOMEPAGE = "https://github.com/etingof/pyasn1-modules" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=190f79253908c986e6cacf380c3a5f6d" -SRC_URI[sha256sum] = "831dbcea1b177b28c9baddf4c6d1013c24c3accd14a1873fffaa6a2e905f17b6" +SRC_URI[sha256sum] = "c28e2dbf9c06ad61c71a075c7e0f9fd0f1b0bb2d2ad4377f240d33ac2ab60a7c" PYPI_PACKAGE = "pyasn1_modules" -inherit pypi ptest setuptools3 +inherit pypi ptest python_setuptools_build_meta RDEPENDS:${PN} = "python3-pyasn1" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb index 1599ea8347..6a325dbe8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyaudio_0.2.14.bb @@ -7,7 +7,7 @@ PYPI_PACKAGE = "PyAudio" SRC_URI[sha256sum] = "78dfff3879b4994d1f4fc6485646a57755c6ee3c19647a491f790a0895bd2f87" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta SRC_URI += "file://0001-Remove-absolute-paths-into-build-machine-system-dirs.patch" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch deleted file mode 100644 index 91575d2712..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11/0001-Do-not-strip-binaries.patch +++ /dev/null @@ -1,54 +0,0 @@ -From debd676cd94f92a30b3be45f1245aa13d8c398c0 Mon Sep 17 00:00:00 2001 -From: Philip Balister <philip@balister.org> -Date: Wed, 8 Jul 2020 09:41:43 -0400 -Subject: [PATCH] Do not strip binaries. - - * OpenEmbedded strips them after creating debug packages. - -Signed-off-by: Philip Balister <philip@balister.org> -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> - -Upstream-Status: Pending ---- - tools/pybind11NewTools.cmake | 7 ------- - tools/pybind11Tools.cmake | 6 ------ - 2 files changed, 13 deletions(-) - -diff --git a/tools/pybind11NewTools.cmake b/tools/pybind11NewTools.cmake -index 7d7424a7..accd90c4 100644 ---- a/tools/pybind11NewTools.cmake -+++ b/tools/pybind11NewTools.cmake -@@ -233,13 +233,6 @@ function(pybind11_add_module target_name) - endif() - endif() - -- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> -- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) -- # Strip unnecessary sections of the binary on Linux/macOS -- pybind11_strip(${target_name}) -- endif() -- - if(MSVC) - target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) - endif() -diff --git a/tools/pybind11Tools.cmake b/tools/pybind11Tools.cmake -index 66ad00a4..855ede41 100644 ---- a/tools/pybind11Tools.cmake -+++ b/tools/pybind11Tools.cmake -@@ -212,12 +212,6 @@ function(pybind11_add_module target_name) - endif() - endif() - -- # Use case-insensitive comparison to match the result of $<CONFIG:cfgs> -- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) -- if(NOT MSVC AND NOT "${uppercase_CMAKE_BUILD_TYPE}" MATCHES DEBUG|RELWITHDEBINFO) -- pybind11_strip(${target_name}) -- endif() -- - if(MSVC) - target_link_libraries(${target_name} PRIVATE pybind11::windows_extras) - endif() --- -2.39.2 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.12.0.bb index 78662fe3cd..0403e406a4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pybind11_2.12.0.bb @@ -7,10 +7,9 @@ DEPENDS = "\ python3-ninja-native \ " -SRCREV = "8a099e44b3d5f85b20f05828d919d2332a8de841" +SRCREV = "3e9dfa2866941655c56877882565e7577de6fc7b" SRC_URI = "\ git://github.com/pybind/pybind11.git;branch=stable;protocol=https \ - file://0001-Do-not-strip-binaries.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb index b6b0de8809..13ccaf99f0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycares_4.4.0.bb @@ -10,7 +10,7 @@ SRC_URI[sha256sum] = "f47579d508f2f56eddd16ce72045782ad3b1b3b678098699e2b6a1b307 PYPI_PACKAGE = "pycares" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta DEPENDS += "python3-cffi-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch new file mode 100644 index 0000000000..cd3e462ddf --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools/0001-downgrade-numpy-version-to-1.26.4.patch @@ -0,0 +1,26 @@ +From 7222a8b9b6e05b89116ca14644aa8db79eecd3c6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 24 Aug 2024 00:19:23 -0700 +Subject: [PATCH] downgrade numpy version to 1.26.4+ + +We can drop it when OE-core upgrades numpy to 2.x + +Upstream-Status: Inappropriate [OE workaround] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + pyproject.toml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/pyproject.toml b/pyproject.toml +index 1bfbd91..cbee520 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -1,7 +1,7 @@ + [build-system] + requires = [ + "cython>=0.27.3", +- "numpy>=2.0.0rc1", ++ "numpy>=1.26.4", + "setuptools>=43.0.0", + "wheel", + ] diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb index bebfb128f2..4d4251316c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycocotools_2.0.8.bb @@ -3,9 +3,15 @@ SUMMARY = "COCO is a large image dataset designed for object detection, segmenta LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://pycocotools/coco.py;beginline=45;endline=45;md5=12cb539683cf245df8b6ce782d78f647" -inherit setuptools3 pypi +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "da8b7815196eebf0adabf67fcc459126cbc6498bbc6ab1fd144c371465d86879" +SRC_URI += "file://0001-downgrade-numpy-version-to-1.26.4.patch" + +SRC_URI[sha256sum] = "8f2bcedb786ba26c367a3680f9c4eb5b2ad9dccb2b34eaeb205e0a021e1dfb8d" DEPENDS = "python3-cython-native python3-numpy-native virtual/crypt" RDEPENDS:${PN} = "python3-matplotlib python3-pillow python3-profile" + +do_compile:append() { + sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" ${B}/pycocotools/_mask.c +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.12.1.bb index a282afb466..9572d21f3b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.11.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycodestyle_2.12.1.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" SECTION = "devel/python" LIC_FILES_CHKSUM = "file://LICENSE;md5=a8546d0e77f416fb05a26acd89c8b3bd" -SRC_URI[sha256sum] = "41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f" +SRC_URI[sha256sum] = "6838eae08bbce4f6accd5d5572075c63626a15ee3e6f842df996bf62f6d73521" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb index 774c1343c2..8dcc2dff18 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pycurl_7.45.3.bb @@ -7,7 +7,7 @@ be used to fetch objects identified by a URL from a Python program \ SECTION = "devel/python" HOMEPAGE = "http://pycurl.io/" -LICENSE = "LGPL-2.0-only | MIT" +LICENSE = "LGPL-2.1-only | MIT" LIC_FILES_CHKSUM = "file://COPYING-LGPL;md5=4fbd65380cdd255951079008b364516c \ file://COPYING-MIT;md5=be42e1b1e58c8d59c2901fd747bfc55d \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc index dd2027948c..531632f32b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc @@ -2,169 +2,197 @@ # from Cargo.lock SRC_URI += " \ - crate://crates.io/ahash/0.8.7 \ - crate://crates.io/aho-corasick/1.0.2 \ - crate://crates.io/allocator-api2/0.2.16 \ - crate://crates.io/autocfg/1.1.0 \ - crate://crates.io/base64/0.21.7 \ - crate://crates.io/bitflags/1.3.2 \ - crate://crates.io/cc/1.0.79 \ + crate://crates.io/ahash/0.8.11 \ + crate://crates.io/aho-corasick/1.1.3 \ + crate://crates.io/autocfg/1.3.0 \ + crate://crates.io/base64/0.22.1 \ + crate://crates.io/bitvec/1.0.1 \ + crate://crates.io/cc/1.0.101 \ crate://crates.io/cfg-if/1.0.0 \ - crate://crates.io/enum_dispatch/0.3.12 \ + crate://crates.io/displaydoc/0.2.5 \ + crate://crates.io/enum_dispatch/0.3.13 \ crate://crates.io/equivalent/1.0.1 \ crate://crates.io/form_urlencoded/1.2.1 \ - crate://crates.io/getrandom/0.2.10 \ - crate://crates.io/hashbrown/0.14.3 \ - crate://crates.io/heck/0.4.1 \ + crate://crates.io/funty/2.0.0 \ + crate://crates.io/getrandom/0.2.15 \ + crate://crates.io/hashbrown/0.14.5 \ + crate://crates.io/heck/0.5.0 \ + crate://crates.io/hex/0.4.3 \ + crate://crates.io/icu_collections/1.5.0 \ + crate://crates.io/icu_locid/1.5.0 \ + crate://crates.io/icu_locid_transform/1.5.0 \ + crate://crates.io/icu_locid_transform_data/1.5.0 \ + crate://crates.io/icu_normalizer/1.5.0 \ + crate://crates.io/icu_normalizer_data/1.5.0 \ + crate://crates.io/icu_properties/1.5.1 \ + crate://crates.io/icu_properties_data/1.5.0 \ + crate://crates.io/icu_provider/1.5.0 \ + crate://crates.io/icu_provider_macros/1.5.0 \ crate://crates.io/idna/0.5.0 \ - crate://crates.io/indexmap/2.0.0 \ - crate://crates.io/indoc/2.0.4 \ - crate://crates.io/itoa/1.0.8 \ - crate://crates.io/jiter/0.0.6 \ - crate://crates.io/lexical-core/0.8.5 \ + crate://crates.io/idna/1.0.1 \ + crate://crates.io/indexmap/2.2.6 \ + crate://crates.io/indoc/2.0.5 \ + crate://crates.io/itoa/1.0.11 \ + crate://crates.io/jiter/0.5.0 \ crate://crates.io/lexical-parse-float/0.8.5 \ crate://crates.io/lexical-parse-integer/0.8.6 \ crate://crates.io/lexical-util/0.8.5 \ - crate://crates.io/lexical-write-float/0.8.5 \ - crate://crates.io/lexical-write-integer/0.8.5 \ - crate://crates.io/libc/0.2.147 \ - crate://crates.io/lock_api/0.4.10 \ - crate://crates.io/memchr/2.6.3 \ - crate://crates.io/memoffset/0.9.0 \ - crate://crates.io/num-bigint/0.4.4 \ - crate://crates.io/num-integer/0.1.45 \ - crate://crates.io/num-traits/0.2.16 \ - crate://crates.io/once_cell/1.18.0 \ - crate://crates.io/parking_lot/0.12.1 \ - crate://crates.io/parking_lot_core/0.9.8 \ + crate://crates.io/libc/0.2.155 \ + crate://crates.io/litemap/0.7.3 \ + crate://crates.io/memchr/2.7.4 \ + crate://crates.io/memoffset/0.9.1 \ + crate://crates.io/num-bigint/0.4.6 \ + crate://crates.io/num-integer/0.1.46 \ + crate://crates.io/num-traits/0.2.19 \ + crate://crates.io/once_cell/1.19.0 \ crate://crates.io/percent-encoding/2.3.1 \ crate://crates.io/portable-atomic/1.6.0 \ - crate://crates.io/proc-macro2/1.0.76 \ - crate://crates.io/pyo3/0.20.3 \ - crate://crates.io/pyo3-build-config/0.20.3 \ - crate://crates.io/pyo3-ffi/0.20.3 \ - crate://crates.io/pyo3-macros/0.20.3 \ - crate://crates.io/pyo3-macros-backend/0.20.3 \ - crate://crates.io/python3-dll-a/0.2.9 \ - crate://crates.io/quote/1.0.35 \ - crate://crates.io/redox_syscall/0.3.5 \ - crate://crates.io/regex/1.10.2 \ - crate://crates.io/regex-automata/0.4.3 \ - crate://crates.io/regex-syntax/0.8.2 \ - crate://crates.io/rustversion/1.0.13 \ - crate://crates.io/ryu/1.0.14 \ - crate://crates.io/scopeguard/1.1.0 \ - crate://crates.io/serde/1.0.195 \ - crate://crates.io/serde_derive/1.0.195 \ - crate://crates.io/serde_json/1.0.109 \ - crate://crates.io/smallvec/1.11.2 \ - crate://crates.io/speedate/0.13.0 \ + crate://crates.io/proc-macro2/1.0.86 \ + crate://crates.io/pyo3/0.22.2 \ + crate://crates.io/pyo3-build-config/0.22.2 \ + crate://crates.io/pyo3-ffi/0.22.2 \ + crate://crates.io/pyo3-macros/0.22.2 \ + crate://crates.io/pyo3-macros-backend/0.22.2 \ + crate://crates.io/python3-dll-a/0.2.10 \ + crate://crates.io/quote/1.0.36 \ + crate://crates.io/radium/0.7.0 \ + crate://crates.io/regex/1.10.5 \ + crate://crates.io/regex-automata/0.4.7 \ + crate://crates.io/regex-syntax/0.8.4 \ + crate://crates.io/rustversion/1.0.17 \ + crate://crates.io/ryu/1.0.18 \ + crate://crates.io/serde/1.0.204 \ + crate://crates.io/serde_derive/1.0.204 \ + crate://crates.io/serde_json/1.0.121 \ + crate://crates.io/smallvec/1.13.2 \ + crate://crates.io/speedate/0.14.4 \ + crate://crates.io/stable_deref_trait/1.2.0 \ crate://crates.io/static_assertions/1.1.0 \ - crate://crates.io/strum/0.25.0 \ - crate://crates.io/strum_macros/0.25.3 \ - crate://crates.io/syn/2.0.48 \ - crate://crates.io/target-lexicon/0.12.9 \ - crate://crates.io/tinyvec/1.6.0 \ + crate://crates.io/strum/0.26.3 \ + crate://crates.io/strum_macros/0.26.4 \ + crate://crates.io/syn/2.0.68 \ + crate://crates.io/synstructure/0.13.1 \ + crate://crates.io/tap/1.0.1 \ + crate://crates.io/target-lexicon/0.12.14 \ + crate://crates.io/tinystr/0.7.6 \ + crate://crates.io/tinyvec/1.6.1 \ crate://crates.io/tinyvec_macros/0.1.1 \ - crate://crates.io/unicode-bidi/0.3.13 \ - crate://crates.io/unicode-ident/1.0.10 \ - crate://crates.io/unicode-normalization/0.1.22 \ + crate://crates.io/unicode-bidi/0.3.15 \ + crate://crates.io/unicode-ident/1.0.12 \ + crate://crates.io/unicode-normalization/0.1.23 \ crate://crates.io/unindent/0.2.3 \ - crate://crates.io/url/2.5.0 \ - crate://crates.io/uuid/1.6.1 \ - crate://crates.io/version_check/0.9.4 \ + crate://crates.io/url/2.5.2 \ + crate://crates.io/utf16_iter/1.0.5 \ + crate://crates.io/utf8_iter/1.0.4 \ + crate://crates.io/uuid/1.9.1 \ + crate://crates.io/version_check/0.9.5 \ crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ - crate://crates.io/windows-targets/0.48.1 \ - crate://crates.io/windows_aarch64_gnullvm/0.48.0 \ - crate://crates.io/windows_aarch64_msvc/0.48.0 \ - crate://crates.io/windows_i686_gnu/0.48.0 \ - crate://crates.io/windows_i686_msvc/0.48.0 \ - crate://crates.io/windows_x86_64_gnu/0.48.0 \ - crate://crates.io/windows_x86_64_gnullvm/0.48.0 \ - crate://crates.io/windows_x86_64_msvc/0.48.0 \ - crate://crates.io/zerocopy/0.7.32 \ - crate://crates.io/zerocopy-derive/0.7.32 \ + crate://crates.io/write16/1.0.0 \ + crate://crates.io/writeable/0.5.5 \ + crate://crates.io/wyz/0.5.1 \ + crate://crates.io/yoke/0.7.4 \ + crate://crates.io/yoke-derive/0.7.4 \ + crate://crates.io/zerocopy/0.7.34 \ + crate://crates.io/zerocopy-derive/0.7.34 \ + crate://crates.io/zerofrom/0.1.4 \ + crate://crates.io/zerofrom-derive/0.1.4 \ + crate://crates.io/zerovec/0.10.4 \ + crate://crates.io/zerovec-derive/0.10.3 \ " -SRC_URI[ahash-0.8.7.sha256sum] = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" -SRC_URI[aho-corasick-1.0.2.sha256sum] = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41" -SRC_URI[allocator-api2-0.2.16.sha256sum] = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" -SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -SRC_URI[base64-0.21.7.sha256sum] = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" -SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" -SRC_URI[cc-1.0.79.sha256sum] = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +SRC_URI[ahash-0.8.11.sha256sum] = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" +SRC_URI[aho-corasick-1.1.3.sha256sum] = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" +SRC_URI[autocfg-1.3.0.sha256sum] = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +SRC_URI[base64-0.22.1.sha256sum] = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +SRC_URI[bitvec-1.0.1.sha256sum] = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" +SRC_URI[cc-1.0.101.sha256sum] = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d" SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -SRC_URI[enum_dispatch-0.3.12.sha256sum] = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" +SRC_URI[displaydoc-0.2.5.sha256sum] = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +SRC_URI[enum_dispatch-0.3.13.sha256sum] = "aa18ce2bc66555b3218614519ac839ddb759a7d6720732f979ef8d13be147ecd" SRC_URI[equivalent-1.0.1.sha256sum] = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" SRC_URI[form_urlencoded-1.2.1.sha256sum] = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -SRC_URI[getrandom-0.2.10.sha256sum] = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" -SRC_URI[hashbrown-0.14.3.sha256sum] = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" -SRC_URI[heck-0.4.1.sha256sum] = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +SRC_URI[funty-2.0.0.sha256sum] = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" +SRC_URI[getrandom-0.2.15.sha256sum] = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" +SRC_URI[hashbrown-0.14.5.sha256sum] = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +SRC_URI[heck-0.5.0.sha256sum] = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" +SRC_URI[hex-0.4.3.sha256sum] = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +SRC_URI[icu_collections-1.5.0.sha256sum] = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +SRC_URI[icu_locid-1.5.0.sha256sum] = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +SRC_URI[icu_locid_transform-1.5.0.sha256sum] = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +SRC_URI[icu_locid_transform_data-1.5.0.sha256sum] = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" +SRC_URI[icu_normalizer-1.5.0.sha256sum] = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +SRC_URI[icu_normalizer_data-1.5.0.sha256sum] = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" +SRC_URI[icu_properties-1.5.1.sha256sum] = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +SRC_URI[icu_properties_data-1.5.0.sha256sum] = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" +SRC_URI[icu_provider-1.5.0.sha256sum] = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +SRC_URI[icu_provider_macros-1.5.0.sha256sum] = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" SRC_URI[idna-0.5.0.sha256sum] = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -SRC_URI[indexmap-2.0.0.sha256sum] = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d" -SRC_URI[indoc-2.0.4.sha256sum] = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -SRC_URI[itoa-1.0.8.sha256sum] = "62b02a5381cc465bd3041d84623d0fa3b66738b52b8e2fc3bab8ad63ab032f4a" -SRC_URI[jiter-0.0.6.sha256sum] = "87db066a99f69382be06d02313f8ce989996b53a04a8a70cfd1a6483a56227f7" -SRC_URI[lexical-core-0.8.5.sha256sum] = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46" +SRC_URI[idna-1.0.1.sha256sum] = "44a986806a1cc899952ba462bc1f28afbfd5850ab6cb030ccb20dd02cc527a24" +SRC_URI[indexmap-2.2.6.sha256sum] = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +SRC_URI[indoc-2.0.5.sha256sum] = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5" +SRC_URI[itoa-1.0.11.sha256sum] = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +SRC_URI[jiter-0.5.0.sha256sum] = "02e23549143ef50eddffd46ba8cd0229b0a4500aef7518cf2eb0f41c9a09d22b" SRC_URI[lexical-parse-float-0.8.5.sha256sum] = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f" SRC_URI[lexical-parse-integer-0.8.6.sha256sum] = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9" SRC_URI[lexical-util-0.8.5.sha256sum] = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc" -SRC_URI[lexical-write-float-0.8.5.sha256sum] = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862" -SRC_URI[lexical-write-integer-0.8.5.sha256sum] = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446" -SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" -SRC_URI[lock_api-0.4.10.sha256sum] = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16" -SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" -SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -SRC_URI[num-bigint-0.4.4.sha256sum] = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0" -SRC_URI[num-integer-0.1.45.sha256sum] = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" -SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" -SRC_URI[parking_lot-0.12.1.sha256sum] = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" -SRC_URI[parking_lot_core-0.9.8.sha256sum] = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447" +SRC_URI[libc-0.2.155.sha256sum] = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +SRC_URI[litemap-0.7.3.sha256sum] = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704" +SRC_URI[memchr-2.7.4.sha256sum] = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +SRC_URI[memoffset-0.9.1.sha256sum] = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a" +SRC_URI[num-bigint-0.4.6.sha256sum] = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +SRC_URI[num-integer-0.1.46.sha256sum] = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f" +SRC_URI[num-traits-0.2.19.sha256sum] = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" +SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -SRC_URI[proc-macro2-1.0.76.sha256sum] = "95fc56cda0b5c3325f5fbbd7ff9fda9e02bb00bb3dac51252d2f1bfa1cb8cc8c" -SRC_URI[pyo3-0.20.3.sha256sum] = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" -SRC_URI[pyo3-build-config-0.20.3.sha256sum] = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" -SRC_URI[pyo3-ffi-0.20.3.sha256sum] = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" -SRC_URI[pyo3-macros-0.20.3.sha256sum] = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" -SRC_URI[pyo3-macros-backend-0.20.3.sha256sum] = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" -SRC_URI[python3-dll-a-0.2.9.sha256sum] = "d5f07cd4412be8fa09a721d40007c483981bbe072cd6a21f2e83e04ec8f8343f" -SRC_URI[quote-1.0.35.sha256sum] = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" -SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" -SRC_URI[regex-1.10.2.sha256sum] = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" -SRC_URI[regex-automata-0.4.3.sha256sum] = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" -SRC_URI[regex-syntax-0.8.2.sha256sum] = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" -SRC_URI[rustversion-1.0.13.sha256sum] = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" -SRC_URI[ryu-1.0.14.sha256sum] = "fe232bdf6be8c8de797b22184ee71118d63780ea42ac85b61d1baa6d3b782ae9" -SRC_URI[scopeguard-1.1.0.sha256sum] = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" -SRC_URI[serde-1.0.195.sha256sum] = "63261df402c67811e9ac6def069e4786148c4563f4b50fd4bf30aa370d626b02" -SRC_URI[serde_derive-1.0.195.sha256sum] = "46fe8f8603d81ba86327b23a2e9cdf49e1255fb94a4c5f297f6ee0547178ea2c" -SRC_URI[serde_json-1.0.109.sha256sum] = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" -SRC_URI[smallvec-1.11.2.sha256sum] = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970" -SRC_URI[speedate-0.13.0.sha256sum] = "242f76c50fd18cbf098607090ade73a08d39cfd84ea835f3796a2c855223b19b" +SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +SRC_URI[pyo3-0.22.2.sha256sum] = "831e8e819a138c36e212f3af3fd9eeffed6bf1510a805af35b0edee5ffa59433" +SRC_URI[pyo3-build-config-0.22.2.sha256sum] = "1e8730e591b14492a8945cdff32f089250b05f5accecf74aeddf9e8272ce1fa8" +SRC_URI[pyo3-ffi-0.22.2.sha256sum] = "5e97e919d2df92eb88ca80a037969f44e5e70356559654962cbb3316d00300c6" +SRC_URI[pyo3-macros-0.22.2.sha256sum] = "eb57983022ad41f9e683a599f2fd13c3664d7063a3ac5714cae4b7bee7d3f206" +SRC_URI[pyo3-macros-backend-0.22.2.sha256sum] = "ec480c0c51ddec81019531705acac51bcdbeae563557c982aa8263bb96880372" +SRC_URI[python3-dll-a-0.2.10.sha256sum] = "bd0b78171a90d808b319acfad166c4790d9e9759bbc14ac8273fe133673dd41b" +SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +SRC_URI[regex-1.10.5.sha256sum] = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +SRC_URI[regex-automata-0.4.7.sha256sum] = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +SRC_URI[regex-syntax-0.8.4.sha256sum] = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" +SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +SRC_URI[serde-1.0.204.sha256sum] = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +SRC_URI[serde_derive-1.0.204.sha256sum] = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +SRC_URI[serde_json-1.0.121.sha256sum] = "4ab380d7d9f22ef3f21ad3e6c1ebe8e4fc7a2000ccba2e4d71fc96f15b2cb609" +SRC_URI[smallvec-1.13.2.sha256sum] = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +SRC_URI[speedate-0.14.4.sha256sum] = "08a20480dbd4c693f0b0f3210f2cee5bfa21a176c1fa4df0e65cc0474e7fa557" +SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" SRC_URI[static_assertions-1.1.0.sha256sum] = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" -SRC_URI[strum-0.25.0.sha256sum] = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" -SRC_URI[strum_macros-0.25.3.sha256sum] = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" -SRC_URI[syn-2.0.48.sha256sum] = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f" -SRC_URI[target-lexicon-0.12.9.sha256sum] = "df8e77cb757a61f51b947ec4a7e3646efd825b73561db1c232a8ccb639e611a0" -SRC_URI[tinyvec-1.6.0.sha256sum] = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +SRC_URI[strum-0.26.3.sha256sum] = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +SRC_URI[strum_macros-0.26.4.sha256sum] = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +SRC_URI[syn-2.0.68.sha256sum] = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9" +SRC_URI[synstructure-0.13.1.sha256sum] = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +SRC_URI[tap-1.0.1.sha256sum] = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +SRC_URI[target-lexicon-0.12.14.sha256sum] = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f" +SRC_URI[tinystr-0.7.6.sha256sum] = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" +SRC_URI[tinyvec-1.6.1.sha256sum] = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82" SRC_URI[tinyvec_macros-0.1.1.sha256sum] = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -SRC_URI[unicode-bidi-0.3.13.sha256sum] = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -SRC_URI[unicode-ident-1.0.10.sha256sum] = "22049a19f4a68748a168c0fc439f9516686aa045927ff767eca0a85101fb6e73" -SRC_URI[unicode-normalization-0.1.22.sha256sum] = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" +SRC_URI[unicode-bidi-0.3.15.sha256sum] = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +SRC_URI[unicode-ident-1.0.12.sha256sum] = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +SRC_URI[unicode-normalization-0.1.23.sha256sum] = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce" -SRC_URI[url-2.5.0.sha256sum] = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -SRC_URI[uuid-1.6.1.sha256sum] = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" -SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[url-2.5.2.sha256sum] = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" +SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" +SRC_URI[uuid-1.9.1.sha256sum] = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" -SRC_URI[windows-targets-0.48.1.sha256sum] = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" -SRC_URI[windows_aarch64_gnullvm-0.48.0.sha256sum] = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" -SRC_URI[windows_aarch64_msvc-0.48.0.sha256sum] = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" -SRC_URI[windows_i686_gnu-0.48.0.sha256sum] = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" -SRC_URI[windows_i686_msvc-0.48.0.sha256sum] = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" -SRC_URI[windows_x86_64_gnu-0.48.0.sha256sum] = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" -SRC_URI[windows_x86_64_gnullvm-0.48.0.sha256sum] = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" -SRC_URI[windows_x86_64_msvc-0.48.0.sha256sum] = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" -SRC_URI[zerocopy-0.7.32.sha256sum] = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be" -SRC_URI[zerocopy-derive-0.7.32.sha256sum] = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6" +SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" +SRC_URI[writeable-0.5.5.sha256sum] = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" +SRC_URI[wyz-0.5.1.sha256sum] = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" +SRC_URI[yoke-0.7.4.sha256sum] = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5" +SRC_URI[yoke-derive-0.7.4.sha256sum] = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95" +SRC_URI[zerocopy-0.7.34.sha256sum] = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" +SRC_URI[zerocopy-derive-0.7.34.sha256sum] = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" +SRC_URI[zerofrom-0.1.4.sha256sum] = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55" +SRC_URI[zerofrom-derive-0.1.4.sha256sum] = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5" +SRC_URI[zerovec-0.10.4.sha256sum] = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +SRC_URI[zerovec-derive-0.10.3.sha256sum] = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch deleted file mode 100644 index 32777e1d03..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch +++ /dev/null @@ -1,126 +0,0 @@ -From a5690f973384bf8cbf4deb3b83d822b7aaefbdd8 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 27 Feb 2024 11:00:46 -0800 -Subject: [PATCH] Bumps [pyo3](https://github.com/pyo3/pyo3) from 0.20.2 to - 0.20.3. - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - Cargo.lock | 26 +++++++++++++++++--------- - Cargo.toml | 2 +- - 2 files changed, 18 insertions(+), 10 deletions(-) - ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -322,6 +322,12 @@ source = "registry+https://github.com/ru - checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - - [[package]] -+name = "portable-atomic" -+version = "1.6.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" -+ -+[[package]] - name = "proc-macro2" - version = "1.0.76" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -357,9 +363,9 @@ dependencies = [ - - [[package]] - name = "pyo3" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "9a89dc7a5850d0e983be1ec2a463a171d20990487c3cfcd68b5363f1ee3d6fe0" -+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233" - dependencies = [ - "cfg-if", - "indoc", -@@ -367,6 +373,7 @@ dependencies = [ - "memoffset", - "num-bigint", - "parking_lot", -+ "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", -@@ -375,9 +382,9 @@ dependencies = [ - - [[package]] - name = "pyo3-build-config" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "07426f0d8fe5a601f26293f300afd1a7b1ed5e78b2a705870c5f30893c5163be" -+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7" - dependencies = [ - "once_cell", - "python3-dll-a", -@@ -386,9 +393,9 @@ dependencies = [ - - [[package]] - name = "pyo3-ffi" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "dbb7dec17e17766b46bca4f1a4215a85006b4c2ecde122076c562dd058da6cf1" -+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa" - dependencies = [ - "libc", - "pyo3-build-config", -@@ -396,9 +403,9 @@ dependencies = [ - - [[package]] - name = "pyo3-macros" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "05f738b4e40d50b5711957f142878cfa0f28e054aa0ebdfc3fd137a843f74ed3" -+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158" - dependencies = [ - "proc-macro2", - "pyo3-macros-backend", -@@ -408,12 +415,13 @@ dependencies = [ - - [[package]] - name = "pyo3-macros-backend" --version = "0.20.2" -+version = "0.20.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "0fc910d4851847827daf9d6cdd4a823fbdaab5b8818325c5e97a86da79e8881f" -+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185" - dependencies = [ - "heck", - "proc-macro2", -+ "pyo3-build-config", - "quote", - "syn", - ] ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -26,7 +26,7 @@ include = [ - ] - - [dependencies] --pyo3 = { version = "0.20.2", features = ["generate-import-lib", "num-bigint"] } -+pyo3 = { version = "0.20.3", features = ["generate-import-lib", "num-bigint"] } - regex = "1.10.2" - strum = { version = "0.25.0", features = ["derive"] } - strum_macros = "0.25.3" -@@ -70,12 +70,12 @@ debug = true - strip = false - - [dev-dependencies] --pyo3 = { version = "0.20.2", features = ["auto-initialize"] } -+pyo3 = { version = "0.20.3", features = ["auto-initialize"] } - - [build-dependencies] - version_check = "0.9.4" - # used where logic has to be version/distribution specific, e.g. pypy --pyo3-build-config = { version = "0.20.2" } -+pyo3-build-config = { version = "0.20.3" } - - [lints.clippy] - dbg_macro = "warn" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch deleted file mode 100644 index f6aa18e303..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Fix-generate_self_schema-for-Python-3.12-1299.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0dcca2ed6a83ebbc944ec8cbd2f67ffec8043461 Mon Sep 17 00:00:00 2001 -From: Jelle Zijlstra <jelle.zijlstra@gmail.com> -Date: Wed, 22 May 2024 07:44:10 -0700 -Subject: [PATCH] Fix generate_self_schema for Python 3.12+ (#1299) - -Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/commit/a7620419383a69bd2b28ab953c9a17f6ed35bb9a] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - generate_self_schema.py | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/generate_self_schema.py b/generate_self_schema.py -index 8d27247..109fca0 100644 ---- a/generate_self_schema.py -+++ b/generate_self_schema.py -@@ -189,7 +189,12 @@ def all_literal_values(type_: type[core_schema.Literal]) -> list[any]: - - def eval_forward_ref(type_: Any) -> Any: - try: -- return type_._evaluate(core_schema.__dict__, None, set()) -+ try: -+ # Python 3.12+ -+ return type_._evaluate(core_schema.__dict__, None, type_params=set(), recursive_guard=set()) -+ except TypeError: -+ # Python 3.9+ -+ return type_._evaluate(core_schema.__dict__, None, set()) - except TypeError: - # for Python 3.8 - return type_._evaluate(core_schema.__dict__, None) diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch new file mode 100644 index 0000000000..5d732d5bee --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core/0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch @@ -0,0 +1,58 @@ +From e07c41b3bad75948201a2201387225694c2fb501 Mon Sep 17 00:00:00 2001 +From: Boxy <rust@boxyuwu.dev> +Date: Wed, 7 Aug 2024 17:11:02 +0100 +Subject: [PATCH] dont embed `RUSTFLAGS` in final binary (#1396) + +Upstream-Status: Backport [https://github.com/pydantic/pydantic-core/pull/1396] + +See discussion upstream in: +https://github.com/pydantic/pydantic-core/issues/1365 + +Backport fix from: +https://github.com/pydantic/pydantic-core/commit/e07c41b3bad75948201a2201387225694c2fb501 + +Signed-off-by: Tim Orling <tim.orling@konsulko.com> +--- + build.rs | 9 +++++++++ + src/lib.rs | 5 ++++- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/build.rs b/build.rs +index d1093c74..f8f66901 100644 +--- a/build.rs ++++ b/build.rs +@@ -36,6 +36,15 @@ fn main() { + println!("cargo:rustc-cfg=has_coverage_attribute"); + } + println!("cargo:rustc-check-cfg=cfg(has_coverage_attribute)"); ++ ++ if std::env::var("RUSTFLAGS") ++ .unwrap_or_default() ++ .contains("-Cprofile-use=") ++ { ++ println!("cargo:rustc-cfg=specified_profile_use"); ++ } ++ println!("cargo:rustc-check-cfg=cfg(specified_profile_use)"); ++ + generate_self_schema(); + println!("cargo:rustc-env=PROFILE={}", std::env::var("PROFILE").unwrap()); + } +diff --git a/src/lib.rs b/src/lib.rs +index eb598424..eb486da6 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -98,7 +98,10 @@ pub fn build_info() -> String { + format!( + "profile={} pgo={}", + env!("PROFILE"), +- option_env!("RUSTFLAGS").unwrap_or("").contains("-Cprofile-use="), ++ // We use a `cfg!` here not `env!`/`option_env!` as those would ++ // embed `RUSTFLAGS` into the generated binary which causes problems ++ // with reproducable builds. ++ cfg!(specified_profile_use), + ) + } + +-- +2.46.0 + diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.21.0.bb index c5ce1ff110..b24e141f60 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.16.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic-core_2.21.0.bb @@ -8,32 +8,41 @@ HOMEPAGE = "https://github.com/pydantic/pydantic-core" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" -SRC_URI += "file://0001-Bumps-pyo3-https-github.com-pyo3-pyo3-from-0.20.2-to.patch \ - file://0001-Fix-generate_self_schema-for-Python-3.12-1299.patch" -SRC_URI[sha256sum] = "1cac689f80a3abab2d3c0048b29eea5751114054f032a941a32de4c852c59cad" +require ${BPN}-crates.inc -DEPENDS = "python3-maturin-native python3-typing-extensions" +SRC_URI += "file://run-ptest" +SRC_URI += "file://0001-dont-embed-RUSTFLAGS-in-final-binary-1396.patch" -require ${BPN}-crates.inc +SRC_URI[sha256sum] = "79c747f9916e5b6cb588dfd994d9ac15a93e43eb07467d9e6f24d892c176bbf5" + +DEPENDS = "python3-maturin-native python3-typing-extensions" inherit pypi cargo-update-recipe-crates python_maturin PYPI_PACKAGE = "pydantic_core" -RDEPENDS:${PN} += "python3-typing-extensions" +RDEPENDS:${PN} += " \ + python3-compression \ + python3-typing-extensions \ +" INSANE_SKIP:${PN} = "already-stripped" +INSANE_SKIP:${PN} += "buildpaths" +# python3-misc is for Lib/timeit.py which is not split out elsewhere inherit ptest -SRC_URI += "file://run-ptest" RDEPENDS:${PN}-ptest += "\ + python3-dateutil \ python3-dirty-equals \ python3-hypothesis \ + python3-misc \ python3-pytest \ python3-pytest-mock \ python3-pytest-timeout \ python3-pytest-benchmark \ + python3-tzdata \ python3-unittest-automake-output \ + python3-zoneinfo \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb index 423fe76733..de610d7815 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.7.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydantic_2.8.2.bb @@ -11,10 +11,12 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=09280955509d1c4ca14bae02f21d49a6" inherit pypi python_hatchling -SRC_URI[sha256sum] = "c46c76a40bb1296728d7a8b99aa73dd70a48c3510111ff290034f860c99c419e" +SRC_URI[sha256sum] = "6f62c13d067b0755ad1c21a34bdd06c0c12625a22b0fc09c6b149816604f7c2a" DEPENDS += "python3-hatch-fancy-pypi-readme-native" +RECIPE_NO_UPDATE_REASON = "Must be updated in sync with python3-pydantic-core." + RDEPENDS:${PN} += "\ python3-annotated-types \ python3-core \ @@ -35,9 +37,13 @@ SRC_URI += "file://run-ptest" RDEPENDS:${PN}-ptest += "\ python3-cloudpickle \ python3-dirty-equals \ + python3-email-validator \ + python3-pydoc \ python3-pytest \ python3-pytest-mock \ + python3-rich \ python3-unittest-automake-output \ + python3-unixadmin \ " do_install_ptest() { diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb index 5754fd2adf..cfdacf53bb 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pydbus_0.6.0.bb @@ -20,7 +20,7 @@ RDEPENDS:${PN} = "python3-pygobject \ python3-io \ python3-logging" -RDEPENDS:${PN}-ptest += "bash" +RDEPENDS:${PN}-ptest += "bash python3-xml" do_install_ptest() { install -d ${D}${PTEST_PATH}/tests diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfanotify_0.3.0.bb index 292ceab2e3..214e80635e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfanotify_0.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyfanotify_0.3.0.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=636a36c9df04efcfacf839b8866d9a37" SRC_URI += "file://0001-ext-define-FNM_EXTMATCH-if-not-already-defined.patch" -SRC_URI[sha256sum] = "90219aa9f8b78fa732f24aa7b21c7bb6ac97a6eb47f1763c899b8194e23af1df" +SRC_URI[sha256sum] = "95ee17caec25436e10d59d5d45e28d2dc659819cc6de55f29fcbdcd5ee2fa8d3" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.8.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.9.0.bb index 92a8f44c6b..7bc3cffdd3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.8.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyjwt_2.9.0.bb @@ -5,14 +5,14 @@ HOMEPAGE = "http://github.com/jpadilla/pyjwt" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=e4b56d2c9973d8cf54655555be06e551" -SRC_URI[sha256sum] = "57e28d156e3d5c10088e0c68abb90bfac3df82b40a71bd0daa20c65ccd5c23de" +SRC_URI[sha256sum] = "7e1e5b56cc735432a7369cbfa0efe50fa113ebecdc04ae6922deba8b84582d0c" -PYPI_PACKAGE = "PyJWT" -inherit pypi setuptools3 +PYPI_PACKAGE = "pyjwt" +inherit pypi python_setuptools_build_meta -RDEPENDS:${PN} = " \ - python3-json \ +RDEPENDS:${PN} = "\ python3-cryptography \ + python3-json \ " BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb index 0de1576af4..eae30dfbff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pylint_3.2.2.bb @@ -25,10 +25,11 @@ RDEPENDS:${PN} += "\ python3-shell \ python3-tomlkit \ " - +# python3-misc for timeit.py RDEPENDS:${PN}-ptest += " \ python3-core \ python3-git \ + python3-misc \ python3-py \ python3-pytest \ python3-pytest-benchmark \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.13.0.bb index 5be6e6319b..1937606642 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymetno_0.13.0.bb @@ -4,7 +4,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=5d503272f52c35147ec960cb56a03bf4" SRC_URI = "git://github.com/Danielhiversen/pyMetno.git;protocol=https;branch=master" -SRCREV = "50f427aad264a4793abb94a3c8cbf987fadcd4ae" +SRCREV = "921812ddad3f147489916c3c7ab7fb7a80d8c646" S = "${WORKDIR}/git" inherit setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.198.bb index c1389982d4..b902061c05 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.190.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymisp_2.4.198.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/MISP/PyMISP" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3639cf5780f71b125d3e9d1dc127c20" -SRC_URI[sha256sum] = "e7374295bfd8c7d25f56867e4395a029433360d95420e39b7f78eb1d4f8b48b4" +SRC_URI[sha256sum] = "f5583263c2fcd380570c084b21c4e4812a01c32daa7baafcdc3f87153edc9303" inherit python_poetry_core pypi diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb index b94504f140..b240837d42 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.6.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymodbus_3.7.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/riptideio/pymodbus/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=eba8057aa82c058d2042b4b0a0e9cc63" -SRC_URI[sha256sum] = "abb214716b56fc62bc0d5d9d964e2249439341746287e918d175f0e3ee241407" +SRC_URI[sha256sum] = "6cc63a14c8cca83f5b6d9dae3319565061bd49503ee7282df681201c16357eef" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.7.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb index 2951f8f85b..fcce456d86 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.7.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pymongo_4.8.0.bb @@ -8,14 +8,18 @@ HOMEPAGE = "http://github.com/mongodb/mongo-python-driver" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRC_URI[sha256sum] = "9024e1661c6e40acf468177bf90ce924d1bc681d2b244adda3ed7b2f4c4d17d7" +SRC_URI[sha256sum] = "454f2295875744dc70f1881e4b2eb99cdad008a33574bc8aaf120530f66c0cde" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta python_hatchling PACKAGES =+ "python3-bson" FILES:python3-bson = "${PYTHON_SITEPACKAGES_DIR}/bson/*" +DEPENDS += " \ + python3-hatch-requirements-txt-native \ +" + RDEPENDS:python3-bson += " \ python3-datetime \ python3-json \ @@ -27,4 +31,6 @@ RDEPENDS:python3-bson += " \ RDEPENDS:${PN} += " \ python3-bson \ python3-pprint \ + python3-difflib \ + python3-logging \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.9.0.bb index dcf0015c59..80af514fab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.8.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyperclip_1.9.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/asweigart/pyperclip" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=d7dd4b0d1f7153322a546e89b5a0a632" -SRC_URI[sha256sum] = "105254a8b04934f0bc84e9c24eb360a591aaf6535c9def5f29d92af107a9bf57" +SRC_URI[sha256sum] = "b7de0142ddc81bfc5c7507eea19da920b92252b548b96186caf94a5e2527d310" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch new file mode 100644 index 0000000000..347996a808 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj/rpath.patch @@ -0,0 +1,18 @@ +Description: Don't set RPATH in libraries. +Author: Bas Couwenberg <sebastic@debian.org> +Forwarded: not-needed + +Upstream-Status: Inappropriate [OE-Specific] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- a/setup.py ++++ b/setup.py +@@ -194,9 +194,6 @@ def get_extension_modules(): + ext_options = { + "include_dirs": include_dirs, + "library_dirs": library_dirs, +- "runtime_library_dirs": ( +- library_dirs if os.name != "nt" and sys.platform != "cygwin" else None +- ), + "libraries": get_libraries(library_dirs), + } + # setup cythonized modules diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb index a4121c3934..cad9464ccf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproj_3.6.1.bb @@ -4,9 +4,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=873757af01d2d221eedb422c4c1dd163" DEPENDS = "python3-cython proj" DEPENDS:append:class-target = " python3-cython-native proj-native" -PYPI_PACKAGE = "pyproj" +inherit pypi python_setuptools_build_meta -inherit pypi setuptools3 +SRC_URI += "file://rpath.patch" SRC_URI[sha256sum] = "44aa7c704c2b7d8fb3d483bbf75af6cb2350d30a63b144279a09b75fead501bf" @@ -21,3 +21,11 @@ RDEPENDS:${PN} = " \ export PROJ_INCDIR = "${STAGING_INCDIR}" export PROJ_LIBDIR = "${STAGING_LIBDIR}" export PROJ_DIR = "${STAGING_BINDIR_NATIVE}/.." + +do_compile:append() { + for f in `find ${B} -name *.c` + do + sed -i -e "/BEGIN: Cython Metadata/,/END: Cython Metadata/d" $f + done + python_pep517_do_compile +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb index aec19949d2..ee8949add7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.6.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyproject-api_1.7.2.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://pyproject-api.readthedocs.io" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" -SRC_URI[sha256sum] = "1817dc018adc0d1ff9ca1ed8c60e1623d5aaca40814b953af14a9cf9a5cae538" +SRC_URI[sha256sum] = "dc5b0e0f6e291a4f22b46e182c9c6d4915c62b1f089b8de1b73f2d06ae453593" PYPI_PACKAGE = "pyproject_api" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb index 3ea980f440..cf9885df71 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyroute2_0.7.12.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dccbff78d7d79ae7e53953d43445c6e6 \ SRC_URI[sha256sum] = "54d226fc3ff2732f49bac9b26853c50c9d05be05a4d9daf09c7cf6d77301eff3" -inherit setuptools3 pypi ptest +inherit python_setuptools_build_meta pypi ptest RDEPENDS:${PN} += " \ python3-ctypes \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.1.1.bb index f5e6dbfcd2..bd6d81aec4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.0.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-lazy-fixtures_1.1.1.bb @@ -12,7 +12,7 @@ HOMEPAGE = "https://github.com/dev-petrov/pytest-lazy-fixtures" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4475e66fcfabe27395e6764c8f69c876" -SRC_URI[sha256sum] = "87ef7424dc0229ff9cb72d482f49b7806535c3500641f612c13ddf243c9adacb" +SRC_URI[sha256sum] = "0c561f0d29eea5b55cf29b9264a3241999ffdb74c6b6e8c4ccc0bd2c934d01ed" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb index 163a363f82..9243f6646e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-metadata_2.0.2.bb @@ -6,9 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d425c8f3157dbf212db2ec53d9e5132" SRC_URI[sha256sum] = "fcd2f416f15be295943527b3c8ba16a44ae5a7141939c90c3dc5ce9d167cf2a5" -PYPI_PACKAGE = "pytest-metadata" - -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} = " \ python3-pytest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch deleted file mode 100644 index f024e79d93..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/0001-test_pytest_mock-skip-args-introspection-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e184fb950ad3b52c5c16438d39fe4d516c784e30 Mon Sep 17 00:00:00 2001 -From: Trevor Gamblin <tgamblin@baylibre.com> -Date: Thu, 12 Oct 2023 17:32:40 -0400 -Subject: [PATCH] test_pytest_mock: skip args introspection tests - -Disable these two tests for now so that python3-pytest-mock can have -successful ptest runs. - -Upstream-Status: Inappropriate [OE-Specific] - -Signed-off-by: Trevor Gamblin <tgamblin@baylibre.com> ---- - tests/test_pytest_mock.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index 3d53241..157b6c3 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -581,6 +581,7 @@ def test_assert_called_wrapper(mocker: MockerFixture) -> None: - stub.assert_called() - - -+@pytest.mark.skip("Async not correctly detected, skip for now") - @pytest.mark.usefixtures("needs_assert_rewrite") - def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: - stub = mocker.stub() -@@ -597,6 +598,7 @@ def test_assert_called_args_with_introspection(mocker: MockerFixture) -> None: - stub.assert_called_once_with(*wrong_args) - - -+@pytest.mark.skip("Async not correctly detected, skip for now") - @pytest.mark.usefixtures("needs_assert_rewrite") - def test_assert_called_kwargs_with_introspection(mocker: MockerFixture) -> None: - stub = mocker.stub() --- -2.41.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch deleted file mode 100644 index 6787c2a3dc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/403.patch +++ /dev/null @@ -1,92 +0,0 @@ -From 8480bb6d0500f933be039cfec65e04157e6ecffe Mon Sep 17 00:00:00 2001 -From: Bruno Oliveira <nicoddemus@gmail.com> -Date: Tue, 19 Dec 2023 08:24:23 -0300 -Subject: [PATCH 1/3] Fix tests for Python 3.11 and 3.12 - -Fixes #401. -Upstream-Status: Backport [https://github.com/pytest-dev/pytest-mock/pull/403] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - tests/test_pytest_mock.py | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index 3ee00da..7acb361 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -246,9 +246,8 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: - msg = "Expected call: {0}()\nNot called" - expected_message = msg.format(expected_name) - stub = mocker.stub(**kwargs) -- with pytest.raises(AssertionError) as exc_info: -+ with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: - stub.assert_called_with() -- assert str(exc_info.value) == expected_message - - def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: - self.__test_failure_message(mocker) - -From c596504e062be06475b03122c9c0cc732ae87840 Mon Sep 17 00:00:00 2001 -From: "pre-commit-ci[bot]" - <66853113+pre-commit-ci[bot]@users.noreply.github.com> -Date: Tue, 19 Dec 2023 11:24:38 +0000 -Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks - -for more information, see https://pre-commit.ci ---- - tests/test_pytest_mock.py | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index 7acb361..c185f2a 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -246,7 +246,9 @@ def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: - msg = "Expected call: {0}()\nNot called" - expected_message = msg.format(expected_name) - stub = mocker.stub(**kwargs) -- with pytest.raises(AssertionError, match=re.escape(expected_message)) as exc_info: -+ with pytest.raises( -+ AssertionError, match=re.escape(expected_message) -+ ) as exc_info: - stub.assert_called_with() - - def test_failure_message_with_no_name(self, mocker: MagicMock) -> None: - -From 6da5b0506d6378a8dbe5ae314d5134e6868aeabd Mon Sep 17 00:00:00 2001 -From: danigm <daniel.garcia@suse.com> -Date: Wed, 20 Dec 2023 16:02:13 +0100 -Subject: [PATCH 3/3] Update expected message to match python 3.11.7 (#404) - -https://github.com/python/cpython/issues/111019 - -Fixes #401. -Closes #403. ---- - tests/test_pytest_mock.py | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/tests/test_pytest_mock.py b/tests/test_pytest_mock.py -index c185f2a..01534a4 100644 ---- a/tests/test_pytest_mock.py -+++ b/tests/test_pytest_mock.py -@@ -25,6 +25,8 @@ - - # Python 3.8 changed the output formatting (bpo-35500), which has been ported to mock 3.0 - NEW_FORMATTING = sys.version_info >= (3, 8) -+# Python 3.11.7 changed the output formatting, https://github.com/python/cpython/issues/111019 -+NEWEST_FORMATTING = sys.version_info >= (3, 11, 7) - - if sys.version_info[:2] >= (3, 8): - from unittest.mock import AsyncMock -@@ -240,7 +242,9 @@ def test_repr_with_name(self, mocker: MockerFixture) -> None: - - def __test_failure_message(self, mocker: MockerFixture, **kwargs: Any) -> None: - expected_name = kwargs.get("name") or "mock" -- if NEW_FORMATTING: -+ if NEWEST_FORMATTING: -+ msg = "expected call not found.\nExpected: {0}()\n Actual: not called." -+ elif NEW_FORMATTING: - msg = "expected call not found.\nExpected: {0}()\nActual: not called." - else: - msg = "Expected call: {0}()\nNot called" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest index 8d2017d39c..51ae892b01 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh - -pytest --automake +# see https://github.com/pytest-dev/pytest-mock/issues/102 for reasons to use plain asserts +pytest --automake --assert=plain diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb index e9a9a4fbc5..b968cf1cd4 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.12.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-mock_3.14.0.bb @@ -5,28 +5,27 @@ LIC_FILES_CHKSUM = " \ file://LICENSE;md5=b2ddb1e69238461b7e4ef2a84d874109 \ " -SRC_URI = " \ - git://github.com/pytest-dev/pytest-mock;branch=main;protocol=https \ +SRC_URI += " \ file://run-ptest \ - file://0001-test_pytest_mock-skip-args-introspection-tests.patch \ - file://403.patch \ " -SRCREV = "69adc6f76c1a7baf4e7a728da9eec38741d5783e" +SRC_URI[sha256sum] = "2719255a1efeceadbc056d6bf3df3d1c5015530fb40cf347c0f9afac88410bd0" -inherit setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest + +PYPI_PACKAGE = "pytest-mock" DEPENDS += "python3-setuptools-scm-native" -RDEPENDS:${PN} += " \ - python3-asyncio \ +RDEPENDS:${PN}-ptest += " \ + python3-misc \ + python3-mock \ python3-pytest \ python3-pytest-asyncio \ - python3-unittest \ + python3-threading \ + python3-tox \ python3-unittest-automake-output \ " -S = "${WORKDIR}/git" - do_install_ptest() { install -d ${D}${PTEST_PATH}/tests cp -rf ${S}/tests ${D}${PTEST_PATH}/ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb new file mode 100644 index 0000000000..e5e5e048bd --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-runner_6.0.1.bb @@ -0,0 +1,15 @@ +SUMMARY = "Invoke py.test as distutils command with dependency resolution" +HOMEPAGE = "https://pypi.org/project/pytest-runner/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7a7126e068206290f3fe9f8d6c713ea6" + +SRC_URI[sha256sum] = "70d4739585a7008f37bf4933c013fdb327b8878a5a69fcbb3316c88882f0f49b" + +inherit pypi python_setuptools_build_meta + +DEPENDS += " \ + python3-setuptools-scm-native" + +RDEPENDS:${PN} = "python3-setuptools python3-debugger python3-json python3-io" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb index b56c26aada..fe9d814c0e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pytest-timeout_2.3.1.bb @@ -3,10 +3,8 @@ HOMEPAGE = "https://github.com/pytest-dev/pytest-timeout/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=d8048cd156eda3df2e7f111b0ae9ceff" -PYPI_PACKAGE = "pytest-timeout" - SRC_URI[sha256sum] = "12397729125c6ecbdaca01035b9e5239d4db97352320af155b3f5de1ba5165d9" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} = "python3-pytest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb index 0911b63ed9..a44fdad3fd 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyudev_0.24.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343" SRC_URI[sha256sum] = "2e945427a21674893bb97632401db62139d91cea1ee96137cc7b07ad22198fc7" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta do_configure:prepend() { sed -i "/import pyudev/d" ${S}/setup.py diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb index 6992ca24cc..19463bc224 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_15.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyunormalize_16.0.0.bb @@ -1,8 +1,8 @@ SUMMARY = "Unicode normalization forms (NFC, NFKC, NFD, NFKD). A library independent from the Python core Unicode database." HOMEPAGE = "https://github.com/mlodewijck/pyunormalize" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dc15b678c3bac1f5b2c873591a330eae" +LIC_FILES_CHKSUM = "file://LICENSE;md5=e2c2ee871081d4e4c24f32e37c413c73" -SRC_URI[sha256sum] = "cf4a87451a0f1cb76911aa97f432f4579e1f564a2f0c84ce488c73a73901b6c1" +SRC_URI[sha256sum] = "2e1dfbb4a118154ae26f70710426a52a364b926c9191f764601f5a8cb12761f7" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb index 30dde5907b..058699fdf2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyyaml-include_2.1.bb @@ -23,6 +23,9 @@ RDEPENDS:${PN} += " \ python3-pyyaml \ " RDEPENDS:${PN}-ptest += " \ + python3-fsspec \ + python3-aiohttp \ + python3-requests \ python3-pytest \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb index 77459c1c57..a4aae4aca9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzstd_0.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-pyzstd_0.16.1.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aedb5a2679cd1552fb61c181ef974b9e" PYPI_PACKAGE = "pyzstd" -SRC_URI[sha256sum] = "fd43a0ae38ae15223fb1057729001829c3336e90f4acf04cf12ebdec33346658" +SRC_URI[sha256sum] = "ed50c08233878c155c73ab2622e115cd9e46c0f1c2e2ddd76f2e7ca24933f195" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.11.bb index 8ad61ab12b..9ecaf5698c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.8.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qface_2.0.11.bb @@ -2,7 +2,7 @@ SUMMARY = "A generator framework based on a common modern IDL" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=eee61e10a40b0e3045ee5965bcd9a8b5" -SRC_URI[sha256sum] = "eccee7dbc4290c5a4e394df8d527f39148e0de0ff22c6b260f48c48f12b3beb4" +SRC_URI[sha256sum] = "b55c239f3ae7e23c5c8434f38901c5bcacb6afd17e88e37934b46e44558df295" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb index 204f4eceec..49cf62860e 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-qrcode_7.4.2.bb @@ -3,10 +3,9 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=4b802d2a65df4626623c79757f486af9" -PYPI_PACKAGE = "qrcode" SRC_URI[sha256sum] = "9dd969454827e127dbd93696b20747239e6d540e082937c90f14ac95b30f5845" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} = " \ python3-six \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.19.bb index d7a56b0519..bfc05a7354 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.17.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rapidjson_1.19.bb @@ -2,9 +2,9 @@ SUMMARY = "Python wrapper around rapidjson" HOMEPAGE = "https://github.com/python-rapidjson/python-rapidjson" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=4daf3929156304df67003c33274a98bd" +LIC_FILES_CHKSUM = "file://LICENSE;md5=6fe0b2465366662d7cfa6793ccbab563" -SRC_URI[sha256sum] = "95a111da29d996af8549f8b32ec701dab3af2ab7c6cd9c79540391ecb05f20c8" +SRC_URI[sha256sum] = "81e7260f6297cad564389b700783c0a33de71310b9eb01fd013faec5e7ed4eff" # Inheriting ptest provides functionality for packaging and installing runtime tests for this recipe inherit setuptools3 pypi ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb index 506e3bc1a6..1dddd04bc9 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-redis_5.0.8.bb @@ -4,7 +4,10 @@ HOMEPAGE = "http://github.com/andymccurdy/redis-py" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=609ded3add9111c4c6e102f1d421d3f8" -SRC_URI[sha256sum] = "ec31f2ed9675cc54c21ba854cfe0462e6faf1d83c8ce5944709db8a4700b9c61" +# Prefix archive to avoid clashing with the main redis archives +PYPI_ARCHIVE_NAME_PREFIX="pypi-" + +SRC_URI[sha256sum] = "0c5b10d387568dfe0698c6fad6615750c24170e548ca2deac10c649d463e9870" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb index 9d356553b9..8fbae0cdcc 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2024.5.15.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-regex_2024.9.11.bb @@ -3,9 +3,9 @@ HOMEPAGE = "https://bitbucket.org/mrabarnett/mrab-regex/src" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7b5751ddd6b643203c31ff873051d069" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "d3ee02d9e5f482cc8309134a91eeaacbdd2261ba111b0fef3748eeb4913e6a2c" +SRC_URI[sha256sum] = "6c188c307e8433bcb63dc1915022deb553b4203a70722fc542c363bf120a01fd" RDEPENDS:${PN} += " \ python3-stringold \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_2.1.0.bb index 7ff984a933..4e0adc39f6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_1.5.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-requests-file_2.1.0.bb @@ -3,15 +3,18 @@ HOMEPAGE = "http://github.com/dashea/requests-file" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=9cc728d6087e43796227b0a31422de6b" -SRC_URI[md5sum] = "c96daf6b0c56687556e8a52748fd896c" -SRC_URI[sha256sum] = "07d74208d3389d01c38ab89ef403af0cfec63957d53a0081d8eca738d0247d8e" +SRC_URI[sha256sum] = "0f549a3f3b0699415ac04d167e9cb39bccfb730cb832b4d20be3d9867356e658" -inherit pypi setuptools3 ptest +PYPI_PACKAGE = "requests_file" + +inherit pypi python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ " +DEPENDS += "python3-setuptools-scm-native" + RDEPENDS:${PN}-ptest += " \ python3-pytest \ python3-unittest-automake-output \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-responses_0.25.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-responses_0.25.3.bb index f4b59c7506..50835883d8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-responses_0.25.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-responses_0.25.3.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=0e601511a8517f4daf688a8eb95be7a2" inherit pypi setuptools3 -SRC_URI[sha256sum] = "01ae6a02b4f34e39bffceb0fc6786b67a25eae919c6368d05eabc8d9576c2a66" +SRC_URI[sha256sum] = "617b9247abd9ae28313d57a75880422d55ec63c29d33d629697590a034358dba" RDEPENDS:${PN} += " \ python3-mock \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb new file mode 100644 index 0000000000..e374979cb4 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-rfc3986-validator_0.1.1.bb @@ -0,0 +1,24 @@ +SUMMARY = "Pure python rfc3986 validator" +HOMEPAGE = "https://github.com/naimetti/rfc3986-validator" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=a21b13b5a996f08f7e0b088aa38ce9c6" + +FILESEXTRAPATHS:prepend := "${THISDIR}/python-rfc3986-validator:" + +SRC_URI[md5sum] = "47f7657b790aaf6011a1ab3d86c6be95" +SRC_URI[sha256sum] = "3d44bde7921b3b9ec3ae4e3adca370438eccebc676456449b145d533b240d055" + +PYPI_PACKAGE = "rfc3986_validator" +UPSTREAM_CHECK_REGEX = "/rfc3986-validator/(?P<pver>(\d+[\.\-_]*)+)/" + +inherit pypi setuptools3 + +SRC_URI += "\ + file://0001-setup.py-move-pytest-runner-to-test_requirements.patch \ +" + +RDEPENDS:${PN} += "\ + python3-core \ +" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb index beb71e6a18..979aba6812 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-robotframework_7.1.bb @@ -13,7 +13,7 @@ inherit pypi setuptools3 PYPI_PACKAGE_EXT = "zip" -SRC_URI[sha256sum] = "04623f758346c917db182e17591ffa474090560c02ed5a64343902e72b7b4bd5" +SRC_URI[sha256sum] = "34796d387e182b36f05d82f3bbc802bd6a30192ebf1e03c76d2086d0d04faaff" RDEPENDS:${PN} += " \ python3-shell \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb index dde0941ef1..eacd67a05c 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.17.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-scikit-build_0.18.1.bb @@ -8,7 +8,7 @@ PYPI_PACKAGE = "scikit_build" inherit pypi python_hatchling -SRC_URI[sha256sum] = "b51a51a36b37c42650994b5047912f59b22e3210b23e321f287611f9ef6e5c9d" +SRC_URI[sha256sum] = "a4152ac5a084d499c28a7797be0628d8366c336e2fb0e1a063eb32e55efcb8e7" RDEPENDS:${PN} = " \ python3-distro \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb index 19ac3f67f0..a7a20707ef 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-screeninfo_0.8.1.bb @@ -4,11 +4,9 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.md;md5=a23813181e06852d377bc25ae5563a97" -PYPI_PACKAGE = "screeninfo" - SRC_URI[sha256sum] = "9983076bcc7e34402a1a9e4d7dabf3729411fd2abb3f3b4be7eba73519cd2ed1" -inherit pypi setuptools3 +inherit pypi python_poetry_core RDEPENDS:${PN} += "\ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb index 941b5ee0f3..9265081fd0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-serpent_1.41.bb @@ -9,8 +9,10 @@ inherit pypi ptest setuptools3 SRC_URI += " \ file://run-ptest \ " - +# python3-misc for timeit.py RDEPENDS:${PN}-ptest += " \ + python3-attrs \ + python3-misc \ python3-pytest \ python3-pytz \ python3-unittest-automake-output \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb index 006fae290d..a1d6a3c0d8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-service-identity_21.1.0.bb @@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8a0f079f4e6a215d6bd6f9d97cab4d5f" SRC_URI[md5sum] = "5e5c195d8fcedc72f9068be2ad9b5a13" SRC_URI[sha256sum] = "6e6c6086ca271dc11b033d17c3a8bea9f24ebff920c587da090afc9519419d34" -inherit pypi setuptools3 ptest +inherit pypi python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ @@ -20,7 +20,9 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ + python3-attrs \ python3-pytest \ + python3-six \ python3-unittest-automake-output \ python3-pyopenssl \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.3.bb index cc5b1bc90a..094efcd8a8 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-simplejson_3.19.3.bb @@ -4,7 +4,7 @@ HOMEPAGE = "http://cheeseshop.python.org/pypi/simplejson" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c6338d7abd321c0b50a2a547e441c52e" -SRC_URI[sha256sum] = "9eb442a2442ce417801c912df68e1f6ccfcd41577ae7274953ab3ad24ef7d82c" +SRC_URI[sha256sum] = "8e086896c36210ab6050f2f9f095a5f1e03c83fa0e7f296d6cba425411364680" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb index b54cdb005f..779562d041 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-smbus2_0.4.3.bb @@ -2,7 +2,7 @@ SUMMARY = "Drop-in replacement for smbus-cffi/smbus-python in pure Python" DESCRIPTION = "smbus2 is a drop-in replacement for smbus-cffi/smbus-python in pure Python" HOMEPAGE = "https://github.com/kplindegaard/smbus2" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://LICENSE;md5=2a3eca2de44816126b3c6f33811a9fba" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.1.bb index 448ac34f54..82c457c39f 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sniffio_1.3.1.bb @@ -7,6 +7,15 @@ LIC_FILES_CHKSUM = "\ file://LICENSE.APACHE2;md5=3b83ef96387f14655fc854ddc3c6bd57 \ " -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta -SRC_URI[sha256sum] = "e60305c5e5d314f5389259b7f22aaa33d8f7dee49763119234af3755c55b9101" +SRC_URI[sha256sum] = "f4324edc670a0f49750a81b895f35c3adb843cca46f0530f79fc1babb23789dc" + +DEPENDS += "\ + python3-setuptools-scm-native \ +" + +RDEPENDS:${PN} += " \ + python3-numbers \ + python3-core \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.6.bb index d26a13dfbd..6572a68459 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-soupsieve_2.6.bb @@ -2,15 +2,20 @@ SUMMARY = "CSS selector library for python-beautifulsoup4" HOMEPAGE = "https://github.com/facelessuser/soupsieve" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=520586fa71ed2cbda50b4a8c89621e09" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bdfa4c8e8b6830bcf8e78cba1669e4d" -SRC_URI[sha256sum] = "5663d5a7b3bfaeee0bc4372e7fc48f9cff4940b3eec54a6451cc5299f1097690" +SRC_URI[sha256sum] = "e2e68417777af359ec65daac1057404a3c8a5455bb8abc36f1a9866ab1a51abb" inherit pypi python_hatchling python_setuptools_build_meta ptest SRC_URI += " \ file://run-ptest \ " +RDEPENDS:${PN} += " \ + python3-core \ + python3-datetime \ + python3-beautifulsoup4 \ +" RDEPENDS:${PN}-ptest += " \ python3-beautifulsoup4 \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.6.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.6.bb index e3fdc435ac..807ee5b783 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.6.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-spidev_3.6.bb @@ -12,4 +12,4 @@ SRCNAME = "spidev" SRC_URI[sha256sum] = "14dbc37594a4aaef85403ab617985d3c3ef464d62bc9b769ef552db53701115b" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.35.bb index 1a42aa1b45..202350dcd1 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.30.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlalchemy_2.0.35.bb @@ -4,10 +4,11 @@ HOMEPAGE = "http://www.sqlalchemy.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c78b979ae6c20775a28a287d32092cbb" -SRC_URI[sha256sum] = "2b1708916730f4830bc69d6f49d37f7698b5bd7530aca7f04f785f8849e95255" +SRC_URI[sha256sum] = "e11d7ea4d24f0a262bccf9a7cd6284c976c5369dac21db237cff59586045ab9f" -PYPI_PACKAGE = "SQLAlchemy" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta + +DEPENDS += "python3-cython-native" RDEPENDS:${PN} += " \ python3-asyncio \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch deleted file mode 100644 index 0c9f29a6b8..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse/0001-sqlparse-change-shebang-to-python3.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f236a30dc8528b6f114201580f1efdcc1c447d43 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Mon, 9 Mar 2020 13:10:37 +0800 -Subject: [PATCH] sqlparse: change shebang to python3 - -Upstream-Status: Pending - -Don't send upstream since upstream still support python2, -we can only make this change after python2 is offcially -dropped. - -Signed-off-by: Changqing Li <changqing.li@windriver.com> -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- - sqlparse/__main__.py | 2 +- - sqlparse/cli.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/sqlparse/__main__.py b/sqlparse/__main__.py -index 2bf2513..6a3a115 100644 ---- a/sqlparse/__main__.py -+++ b/sqlparse/__main__.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2009-2020 the sqlparse authors and contributors - # <see AUTHORS file> -diff --git a/sqlparse/cli.py b/sqlparse/cli.py -index 7a8aacb..9c727e8 100755 ---- a/sqlparse/cli.py -+++ b/sqlparse/cli.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python3 - # - # Copyright (C) 2009-2020 the sqlparse authors and contributors - # <see AUTHORS file> --- -2.41.0 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb index c04971ee8f..daf67607f7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.4.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sqlparse_0.5.1.bb @@ -4,18 +4,19 @@ SECTION = "devel/python" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=2b136f573f5386001ea3b7b9016222fc" -SRC_URI += "file://0001-sqlparse-change-shebang-to-python3.patch \ - file://run-ptest \ - " +SRC_URI:append = " \ + file://run-ptest \ +" -SRC_URI[sha256sum] = "d446183e84b8349fa3061f0fe7f06ca94ba65b426946ffebe6e3e8295332420c" +SRC_URI[sha256sum] = "bb6b4df465655ef332548e24f08e205afc81b9ab86cb1c45657a7ff173a3a00e" export BUILD_SYS export HOST_SYS -inherit pypi ptest python_flit_core +inherit pypi ptest python_hatchling -RDEPENDS:${PN}-ptest += " \ +RDEPENDS:${PN}-ptest += "\ + python3-mypy \ python3-pytest \ python3-unittest-automake-output \ python3-unixadmin \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb index 2bdaf8ed20..02577964ca 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.12.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-sympy_1.13.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/sympy/" LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=ea48085d7dff75b49271b25447e8cdca" -SRC_URI[sha256sum] = "2877b03f998cd8c08f07cd0de5b767119cd3ef40d09f41c30d722f6686b0fb88" +SRC_URI[sha256sum] = "401449d84d07be9d0c7a46a64bd54fe097667d5e7181bfe67ec777be9e01cb13" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb index 7d508ad809..fe0aabf0ff 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-term_2.5.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=d90e2d280a4836c607520383d1639be1" SRC_URI[sha256sum] = "846fda941dbb8a7c9f246e99bf5ee731910fc4a4cc54b7e36457c133c9f6b78b" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} = "\ python3-io \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb new file mode 100644 index 0000000000..649464b961 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-toml_0.10.2.bb @@ -0,0 +1,15 @@ +SUMMARY = "Python Library for Tom's Obvious, Minimal Language" +HOMEPAGE = "https://github.com/uiri/toml" +LICENSE = "MIT" +SECTION = "devel/python" +LIC_FILES_CHKSUM = "file://LICENSE;md5=16c77b2b1050d2f03cb9c2ed0edaf4f0" + +SRC_URI[sha256sum] = "b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + +inherit pypi setuptools3 + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-misc \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb new file mode 100644 index 0000000000..9401ed897f --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomli_2.0.1.bb @@ -0,0 +1,18 @@ +SUMMARY = "A lil' TOML parser" +DESCRIPTION = "Tomli is a Python library for parsing TOML. Tomli is fully \ +compatible with TOML v1.0.0." +HOMEPAGE = "https://github.com/hukkin/tomli" +BUGTRACKER = "https://github.com/hukkin/tomli/issues" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=aaaaf0879d17df0110d1aa8c8c9f46f5" + +inherit pypi python_flit_core + +SRC_URI[sha256sum] = "de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" + +BBCLASSEXTEND = "native nativesdk" + +RDEPENDS:${PN} += " \ + python3-datetime \ + python3-stringold \ +" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.5.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.13.2.bb index f5612a18db..9fca145407 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.12.5.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tomlkit_0.13.2.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://pypi.org/project/tomlkit/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=31aac0dbc1babd278d5386dadb7f8e82" -SRC_URI[sha256sum] = "eef34fba39834d4d6b73c9ba7f3e4d1c417a4e56f89a7e96e090dd0d24b8fb3c" +SRC_URI[sha256sum] = "fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79" inherit pypi python_poetry_core ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.4.1.bb index b01c1cec2a..b8f6752f28 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tornado_6.4.1.bb @@ -6,9 +6,9 @@ HOMEPAGE = "http://www.tornadoweb.org/en/stable/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "72291fa6e6bc84e626589f1c29d90a5a6d593ef5ae68052ee2ef000dfd273dee" +SRC_URI[sha256sum] = "92d3ab53183d8c50f8204a51e6f91d18a15d5ef261e84d452800d4ff6fc504e9" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta # Requires _compression which is currently located in misc RDEPENDS:${PN} += " \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.15.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.15.1.bb index 4296738ec9..367fafab49 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.15.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tox_4.15.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "http://tox.readthedocs.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=11610a9d8fd95649cf8159be12b98cb7" -SRC_URI[sha256sum] = "7a0beeef166fbe566f54f795b4906c31b428eddafc0102ac00d20998dd1933f6" +SRC_URI[sha256sum] = "53a092527d65e873e39213ebd4bd027a64623320b6b0326136384213f95b7076" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.5.bb index 485d24f523..409936d5c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tqdm_4.66.5.bb @@ -5,7 +5,7 @@ SECTION = "devel/python" LICENSE = "MIT & MPL-2.0" LIC_FILES_CHKSUM = "file://LICENCE;md5=42dfa9e8c616dbc295df3f58d756b2a1" -SRC_URI[sha256sum] = "e4d936c9de8727928f3be6079590e97d9abfe8d39a590be678eb5919ffc186bb" +SRC_URI[sha256sum] = "e1020aef2e5096702d8a025ac7d16b1577279c9d63f8375b63083e9a5f0fcbad" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.9.2.bb index 5f1e3d9e26..3a27b666cf 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.9.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-transitions_0.9.2.bb @@ -4,6 +4,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=de0a0876a688a4483bfafa764773ab39" inherit pypi setuptools3 -SRC_URI[sha256sum] = "3542c37108e93e2ae5f215208ec5732c94a772937854a102cd7345b967fee61b" +SRC_URI[sha256sum] = "2f8490dbdbd419366cef1516032ab06d07ccb5839ef54905e842a472692d4204" RDEPENDS:${PN} += "python3-six python3-logging" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb index 21161a0e0f..dab18f28b6 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-trustme_1.1.0.bb @@ -20,10 +20,12 @@ RDEPENDS:${PN} += " \ " RDEPENDS:${PN}-ptest += " \ + python3-attrs \ python3-pyopenssl \ python3-pyasn1-modules \ python3-pytest \ python3-service-identity \ + python3-six \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.1.1.bb index 6a79d45d43..13ddc08cd0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.1.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twine_5.1.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://twine.readthedocs.io/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a3d1106b253a8d50dd82a4202a045b4c" -SRC_URI[sha256sum] = "4d74770c88c4fcaf8134d2a6a9d863e40f08255ff7d8e2acb3cbbd57d25f6e9d" +SRC_URI[sha256sum] = "9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb index 336c173893..e0472d1d87 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_24.3.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-twisted_24.7.0.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://twisted.org" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=c1c5d2c2493b848f83864bdedd67bbf5" -SRC_URI[sha256sum] = "6b38b6ece7296b5e122c9eb17da2eeab3d98a198f50ca9efd00fb03e5b4fd4ae" +SRC_URI[sha256sum] = "5a60147f044187a127ec7da96d170d49bcce50c6fd36f594e60f4587eff4d394" inherit pypi python_hatchling @@ -49,6 +49,7 @@ RDEPENDS:${PN} = "\ RDEPENDS:${PN}-core = "python3-appdirs \ python3-asyncio \ + python3-attrs \ python3-automat \ python3-constantly \ python3-core \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typer/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-typer/run-ptest index 94b40789b1..94b6c0fc22 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typer/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typer/run-ptest @@ -3,4 +3,5 @@ # Ignore the test_tutorial and test_completion. # Because it needs the docs_src package what is not in Yocto. # And the tests are not that useful for Yocto. -pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion +# for test_rich_markup_mode.py see https://github.com/fastapi/typer/pull/859/files/2cfd641d86a591a0d8582dec9292c03e6322a21a +pytest --automake --ignore tests/test_tutorial --ignore tests/test_completion --deselect tests/test_rich_markup_mode.py::test_rich_markup_mode_rich diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-typer_0.12.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-typer_0.12.5.bb index cc8669c375..e175b54207 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-typer_0.12.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-typer_0.12.5.bb @@ -7,7 +7,7 @@ HOMEPAGE = "https://github.com/tiangolo/typer" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=173d405eb704b1499218013178722617" -SRC_URI[sha256sum] = "49e73131481d804288ef62598d97a1ceef3058905aa536a1134f90891ba35482" +SRC_URI[sha256sum] = "f592f089bedcc8ec1b974125d64851029c3b1af145f04aca64d69410f0c9b722" inherit pypi python_setuptools_build_meta ptest diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb deleted file mode 100644 index d0684ba933..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_5.9.5.20240516.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Typing stubs for psutil" -HOMEPAGE = "https://github.com/python/typeshed" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "bb296f59fc56458891d0feb1994717e548a1bcf89936a2877df8792b822b4696" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb new file mode 100644 index 0000000000..331756e461 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-psutil_6.0.0.20240901.bb @@ -0,0 +1,10 @@ +SUMMARY = "Typing stubs for psutil" +HOMEPAGE = "https://github.com/python/typeshed" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "437affa76670363db9ffecfa4f153cc6900bf8a7072b3420f3bc07a593f92226" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb deleted file mode 100644 index 4b786066f7..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240316.bb +++ /dev/null @@ -1,8 +0,0 @@ -SUMMARY = "Typing stubs for python-dateutil" -HOMEPAGE = "https://github.com/python/typeshed" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" - -SRC_URI[sha256sum] = "5d2f2e240b86905e40944dd787db6da9263f0deabef1076ddaed797351ec0202" - -inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb new file mode 100644 index 0000000000..5c3a477432 --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-python-dateutil_2.9.0.20240906.bb @@ -0,0 +1,8 @@ +SUMMARY = "Typing stubs for python-dateutil" +HOMEPAGE = "https://github.com/python/typeshed" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" + +SRC_URI[sha256sum] = "9706c3b68284c25adffc47319ecc7947e5bb86b3773f843c73906fd598bc176e" + +inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb deleted file mode 100644 index 781d3b5bbc..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_70.0.0.20240524.bb +++ /dev/null @@ -1,10 +0,0 @@ -SUMMARY = "Typing stubs for setuptools" -HOMEPAGE = "https://github.com/python/typeshed" -LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=ef4dc1e740f5c928f1608a4a9c7b578e" - -inherit pypi setuptools3 - -SRC_URI[sha256sum] = "e31fee7b9d15ef53980526579ac6089b3ae51a005a281acf97178e90ac71aff6" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb new file mode 100644 index 0000000000..2eaa2d136e --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-types-setuptools_73.0.0.20240822.bb @@ -0,0 +1,10 @@ +SUMMARY = "Typing stubs for setuptools" +HOMEPAGE = "https://github.com/python/typeshed" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=c2d9643b4523fdf462545aeb1356ad23" + +inherit pypi setuptools3 + +SRC_URI[sha256sum] = "3a060681098eb3fbc2fea0a86f7f6af6aa1ca71906039d88d891ea2cecdd4dbf" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata/run-ptest new file mode 100644 index 0000000000..8d2017d39c --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata/run-ptest @@ -0,0 +1,3 @@ +#!/bin/sh + +pytest --automake diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb new file mode 100644 index 0000000000..d81ded430a --- /dev/null +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-tzdata_2024.1.bb @@ -0,0 +1,25 @@ +SUMMARY = "Provider of IANA time zone data" +HOMEPAGE = "https://github.com/python/tzdata" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=fca9fd5c15a28eb874ba38577a585d48 \ + file://licenses/LICENSE_APACHE;md5=86d3f3a95c324c9479bd8986968f4327" + +SRC_URI[sha256sum] = "2674120f8d891909751c38abcdfd386ac0a5a1127954fbc332af6b5ceae07efd" + +inherit pypi python_setuptools_build_meta + +inherit ptest + +SRC_URI += "file://run-ptest" + +RDEPENDS:${PN}-ptest += "\ + python3-attrs \ + python3-pytest \ + python3-pytest-subtests \ + python3-unittest-automake-output \ +" + +do_install_ptest() { + cp -rf ${S}/tests/ ${D}${PTEST_PATH}/ + install ${S}/VERSION ${D}${PTEST_PATH}/ +} diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch deleted file mode 100644 index 8ba8ada556..0000000000 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/0001-setup.py-Do-not-strip-debugging-symbols.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aec3b64b0aaea0178b44ea65a204d76696e6a45e Mon Sep 17 00:00:00 2001 -From: Leon Anavi <leon.anavi@konsulko.com> -Date: Mon, 10 Jan 2022 14:04:28 +0200 -Subject: [PATCH] setup.py: Do not strip debugging symbols - -Do not strip debugging symbols from Linux binaries to avoid -bitbake build errors related to already-stripped. - -Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> ---- -Upstream-Status: Pending - - setup.py | 8 +------- - 1 file changed, 1 insertion(+), 7 deletions(-) - -diff --git a/setup.py b/setup.py -index b98963b..d42f07a 100644 ---- a/setup.py -+++ b/setup.py -@@ -19,13 +19,7 @@ if not dconv_libs: - dconv_source_files.extend(glob("./deps/double-conversion/double-conversion/*.cc")) - dconv_source_files.append("./lib/dconv_wrapper.cc") - --if platform.system() == "Linux" and environ.get("UJSON_BUILD_NO_STRIP", "0") not in ( -- "1", -- "True", --): -- strip_flags = ["-Wl,--strip-all"] --else: -- strip_flags = [] -+strip_flags = [] - - module1 = Extension( - "ujson", --- -2.25.1 - diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest index 8d2017d39c..4863c5e5a3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson/run-ptest @@ -1,3 +1,3 @@ #!/bin/sh -pytest --automake +FORCE_COLOR=1 pytest --automake --capture=no diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb index c64c800626..5f4439c4c3 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-ujson_5.10.0.bb @@ -6,15 +6,17 @@ LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e0039a83d8a99726b5 SRC_URI[sha256sum] = "b3cd8f3c5d8c7738257f1018880444f7b7d9b66232c64649f562d7ba86ad4bc1" -inherit pypi ptest setuptools3 +inherit pypi ptest python_setuptools_build_meta + +# let OE do the strip operation +export UJSON_BUILD_NO_STRIP = "1" + +DEPENDS += "python3-setuptools-scm-native" SRC_URI += " \ file://run-ptest \ - file://0001-setup.py-Do-not-strip-debugging-symbols.patch \ " -DEPENDS += "python3-setuptools-scm-native" - RDEPENDS:${PN} += "\ python3-datetime \ python3-numbers \ @@ -22,6 +24,7 @@ RDEPENDS:${PN} += "\ RDEPENDS:${PN}-ptest += " \ python3-json \ + python3-misc \ python3-pytest \ python3-pytz \ python3-unittest-automake-output \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb index a132d74ebd..41ead5c051 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-validators_0.28.3.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-validators_0.34.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://python-validators.github.io/validators" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=b3fb4b9e6db86c69a33d5e3ee013ab59" -SRC_URI[sha256sum] = "c6c79840bcde9ba77b19f6218f7738188115e27830cbaff43264bc4ed24c429d" +SRC_URI[sha256sum] = "647fe407b45af9a74d245b943b18e6a816acf4926974278f6dd617778e1e781f" inherit pypi python_setuptools_build_meta ptest @@ -12,6 +12,10 @@ SRC_URI += " \ " RDEPENDS:${PN}-ptest += " \ + python3-decorator \ + python3-eth-hash \ + python3-isort \ + python3-pycryptodome \ python3-pytest \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb index c7c7d48980..82d60aeaab 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.26.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-virtualenv_20.26.5.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/pypa/virtualenv" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=0ce089158cf60a8ab6abb452b6405538" -SRC_URI[sha256sum] = "82bf0f4eebbb78d36ddaee0283d43fe5736b53880b8a8cdcd37390a07ac3741c" +SRC_URI[sha256sum] = "ce489cac131aa58f4b25e321d6d186171f78e6cb13fafbf32a840cee67733ff4" BBCLASSEXTEND = "native nativesdk" inherit pypi python_hatchling @@ -16,7 +16,11 @@ DEPENDS += "\ " RDEPENDS:${PN} += " \ + python3-compression \ python3-distlib \ python3-filelock \ + python3-json \ + python3-misc \ + python3-modules \ python3-platformdirs \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb index 4d0a626c47..ad66523dea 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_4.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-watchdog_5.0.2.bb @@ -4,7 +4,7 @@ DEPENDS = "python3-argh" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "eebaacf674fa25511e8867028d281e602ee6500045b57f43b08778082f7f8b44" +SRC_URI[sha256sum] = "dcebf7e475001d2cdeb020be630dc5b687e9acdd60d16fea6bb4508e7b94cf76" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb index 7f06ca5006..b3487b6d8b 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.19.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-web3_6.20.1.bb @@ -4,7 +4,7 @@ SECTION = "devel/python" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=373fede350846fdffd23648fba504635" -SRC_URI[sha256sum] = "d27fbd4ac5aa70d0e0c516bd3e3b802fbe74bc159b407c34052d9301b400f757" +SRC_URI[sha256sum] = "a29bc1863734e1c05f128ddbc56878f299ea71776806e667b581a83b5d5be0ed" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.3.bb index 448abe1897..a5e343bf25 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-werkzeug_3.0.3.bb @@ -8,9 +8,9 @@ cookie handling, file uploads, a powerful URL routing system and a bunch \ of community contributed addon modules." HOMEPAGE = "https://werkzeug.palletsprojects.com" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE.rst;md5=5dc88300786f1c214c1e9827a5229462" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=5dc88300786f1c214c1e9827a5229462" -SRC_URI[sha256sum] = "507e811ecea72b18a404947aded4b3390e1db8f826b494d76550ef45bb3b1dcc" +SRC_URI[sha256sum] = "097e5bfda9f0aba8da6b8545146def481d06aa7d3266e7448e2cccf67dd8bd18" inherit pypi python_flit_core diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.6.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.7.0.bb index 2dc64af57f..48d5a925c2 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.6.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-whitenoise_6.7.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=aba4901cc64e401cea5a267eac2a2e1e" PYPI_PACKAGE = "whitenoise" -SRC_URI[sha256sum] = "8998f7370973447fac1e8ef6e8ded2c5209a7b1f67c1012866dbcd09681c3251" +SRC_URI[sha256sum] = "58c7a6cd811e275a6c91af22e96e87da0b1109e9a53bb7464116ef4c963bf636" inherit pypi python_setuptools_build_meta diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb index 056323cd39..398d2fa6b7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-wrapt_1.16.0.bb @@ -12,7 +12,9 @@ SRC_URI += " \ file://run-ptest \ " +# python3-misc for 'this' module RDEPENDS:${PN}-ptest += " \ + python3-misc \ python3-pytest \ python3-unittest-automake-output \ " diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb index 93ca5525ba..6e8f1b24da 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xlsxwriter_3.2.0.bb @@ -1,7 +1,7 @@ SUMMARY = "Python 2 and 3 compatibility library" HOMEPAGE = "https://xlsxwriter.readthedocs.io" SECTION = "devel/python" -LICENSE = "MIT" +LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a4bab8df34a9a138b4e0ca56b8559a05" inherit pypi setuptools3 diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.3.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.4.1.bb index a80f6c2db2..845735c9ba 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.3.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmlschema_3.4.1.bb @@ -3,14 +3,9 @@ HOMEPAGE = "https://github.com/sissaschool/xmlschema" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=26aa26eda991a3a2b61c11b62d3fda65" -SRC_URI[sha256sum] = "2066ecbc9728112073f6f44d17c5c16723aff1c7d22a7c4c6421e2d68ec5f0ea" +SRC_URI[sha256sum] = "4f69eca6f2c446b06c74acd958e7d6613487c253d959a3b75078dfcc880b80ff" -PYPI_PACKAGE = "xmlschema" -inherit pypi setuptools3 - -DEPENDS += "\ - python3-elementpath-native \ -" +inherit pypi python_setuptools_build_meta RDEPENDS:${PN} += "\ python3-elementpath \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb index 482f0c641b..e41afb56c0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xmodem_0.4.7.bb @@ -1,7 +1,7 @@ DESCRIPTION = "XMODEM protocol implementation" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://LICENSE;md5=90bc9522130d68de0dcbf33707bbf124" SRC_URI[sha256sum] = "2f1068aa8676f0d1d112498b5786c4f8ea4f89d8f25d07d3a0f293cd21db1c35" @@ -9,8 +9,8 @@ inherit pypi setuptools3 do_install:append() { install -d ${D}${docdir}/${PN} - mv ${D}/usr/doc/* ${D}${docdir}/${PN}/ - rmdir ${D}/usr/doc + mv ${D}${prefix}/doc/* ${D}${docdir}/${PN}/ + rmdir ${D}${prefix}/doc } RDEPENDS:${PN} += " \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.5.0.bb index be9ce005ea..bfa14012d0 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.4.1.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-xxhash_3.5.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3a9dab7f159514231249aa3e108ab26b" DEPENDS += "python3-setuptools-scm-native" -SRC_URI[sha256sum] = "0379d6cf1ff987cd421609a264ce025e74f346e3e145dd106c0cc2e3ec3f99a9" +SRC_URI[sha256sum] = "84f2caddf951c9cbf8dc2e22a89d4ccf5d86391ac6418fe81e3c67d0cf60b45f" SRC_URI += " \ file://run-ptest \ diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.11.1.bb index 29897b7f1c..37d77b7183 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.9.4.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-yarl_1.11.1.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/aio-libs/yarl/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "566db86717cf8080b99b58b083b773a908ae40f06681e87e589a976faf8246bf" +SRC_URI[sha256sum] = "1bb2d9e212fb7449b8fb73bc461b51eaa17cc8430b4a87d87be7b25052d92f53" SRC_URI += "file://run-ptest" diff --git a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb index 421bd3b6c8..b1b1a2e4c5 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.132.2.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python/python3-zeroconf_0.134.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/jstasiak/python-zeroconf" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=6;endline=6;md5=6517bdc8f2416f27ab725d4702f7aac3" -SRC_URI[sha256sum] = "9ad8bc6e3f168fe8c164634c762d3265c775643defff10e26273623a12d73ae1" +SRC_URI[sha256sum] = "5be2c3a61cc81eb1bd4684bbdee19d708522d94bc8ac60dfe001a0fde4421092" DEPENDS += "python3-cython-native" diff --git a/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.0.13.bb b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb index bb5b973d86..6884e908a7 100644 --- a/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.0.13.bb +++ b/meta-openembedded/meta-python/recipes-devtools/python3-reedsolo/python3-reedsolo_2.1.0b1.bb @@ -3,8 +3,9 @@ HOMEPAGE = "https://github.com/tomerfiliba/reedsolomon" LICENSE = "MIT-0 | Unlicense" LIC_FILES_CHKSUM = "file://LICENSE;md5=ffde61aeb8917e70e0257e0a4b6d103c" -SRC_URI[sha256sum] = "71b4121c6860a55899435c552051a19d5f023c50358be4b1c0fa0c6e2f4ac717" +SRC_URI[sha256sum] = "e11528d63e75461d45b86c23f9db8260303d6ab6cae075fa9eddb44527ad8ece" -inherit pypi setuptools3 +inherit pypi python_setuptools_build_meta +DEPENDS += "python3-cython-native" RDEPENDS:${PN} += "python3-core" diff --git a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.52.bb index e83514af1b..266b94c9d8 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.51.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-meh/python3-meh_0.52.bb @@ -11,6 +11,6 @@ S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/python-meh.git;protocol=https;branch=master" -SRCREV = "eb5d4adc3b838704b6a68f0f77ada2063a11ab1b" +SRCREV = "f0fcc3ce1943dce9cf958f4a2f7398daff619c9f" FILES:${PN} += "${datadir}/python-meh" diff --git a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb index 953068f7c3..a7bd8ae437 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-pykickstart/python3-pykickstart_3.48.bb @@ -5,13 +5,13 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b" FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -DEPENDS = "python3" +inherit python_setuptools_build_meta + RDEPENDS:${PN} = "python3 \ python3-requests \ python3-six \ " -S = "${WORKDIR}/git" SRC_URI = "git://github.com/rhinstaller/pykickstart.git;protocol=https;branch=master \ file://0001-support-authentication-for-kickstart.patch \ file://0002-pykickstart-parser.py-add-lock-for-readKickstart-and.patch \ @@ -22,4 +22,4 @@ SRCREV = "fa6c80c0e5c6bee29d089899a10d26e6f7f8afd8" UPSTREAM_CHECK_GITTAGREGEX = "r(?P<pver>\d+(\.\d+)+(-\d+)*)" -inherit setuptools3 +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.1.bb b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.8.1.bb index 27bc95428f..10ce1987bd 100644 --- a/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.7.1.bb +++ b/meta-openembedded/meta-python/recipes-extended/python-rich/python3-rich_13.8.1.bb @@ -8,7 +8,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b5f0b94fbc94f5ad9ae4efcf8a778303" -SRC_URI[sha256sum] = "9be308cb1fe2f1f57d67ce99e95af38a1e2bc71ad9813b0e247cf7ffbcc3a432" +SRC_URI[sha256sum] = "8260cda28e3db6bf04d2d1ef4dbc03ba80a824c88b0e7668a0f23126a424844a" inherit pypi python_poetry_core diff --git a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.10.1.bb index c45a3fcda2..8c03398ed1 100644 --- a/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.8.2.bb +++ b/meta-openembedded/meta-python/recipes-extended/python3-portalocker/python3-portalocker_2.10.1.bb @@ -4,7 +4,7 @@ LICENSE = "BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=152634da660a374ca18c0734ed07c63c" -SRC_URI[sha256sum] = "2b035aa7828e46c58e9b31390ee1f169b98e1066ab10b9a6a861fe7e25ee4f33" +SRC_URI[sha256sum] = "ef1bf844e878ab08aee7e40184156e1151f228f103aa5c6bd0724cc330960f8f" DEPENDS += "python3-setuptools-scm-native" diff --git a/meta-openembedded/meta-webserver/README.md b/meta-openembedded/meta-webserver/README.md index d1b743887c..8b45a73b6e 100644 --- a/meta-openembedded/meta-webserver/README.md +++ b/meta-openembedded/meta-webserver/README.md @@ -13,13 +13,13 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core subdirectory: meta -branch: master +branch: styhead For some recipes, the meta-oe layer is required: URI: git://git.openembedded.org/meta-openembedded subdirectory: meta-oe -branch: master +branch: styhead @@ -50,9 +50,12 @@ Maintenance ----------- Send patches / pull requests to openembedded-devel@lists.openembedded.org -with '[meta-webserver]' in the subject. +with '[meta-webserver][styhead]' in the subject. -Layer maintainer: Derek Straka <derek@asterius.io> +When sending single patches, please using something like: +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-webserver][styhead][PATCH' + +Layer maintainer: Armin Kuster <akuster808@gmail.com> License diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch index bbe8b325b5..64edeb5936 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0002-apache2-bump-up-the-core-size-limit-if-CoreDumpDirec.patch @@ -1,4 +1,4 @@ -From 5074ab3425e5f1e01fd9cfa2d9b7300ea1b3f38f Mon Sep 17 00:00:00 2001 +From d1f0389e699e64f3e329c0ce509f79d969a76114 Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Tue, 17 Jul 2012 11:27:39 +0100 Subject: [PATCH] apache2: bump up the core size limit if CoreDumpDirectory is @@ -16,10 +16,10 @@ Note: upstreaming was discussed but there are competing desires; 1 file changed, 19 insertions(+) diff --git a/server/core.c b/server/core.c -index 090e397..3020090 100644 +index 843b973..3b50100 100644 --- a/server/core.c +++ b/server/core.c -@@ -5107,6 +5107,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5143,6 +5143,25 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } apr_pool_cleanup_register(pconf, NULL, ap_mpm_end_gen_helper, apr_pool_cleanup_null); @@ -45,6 +45,3 @@ index 090e397..3020090 100644 return OK; } --- -2.25.1 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch index 1abbe0c41f..f8fbc4f3c9 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0004-apache2-log-the-SELinux-context-at-startup.patch @@ -1,4 +1,4 @@ -From e47cc405eadcbe37a579c375e824e20a5c53bfad Mon Sep 17 00:00:00 2001 +From b31cf12566e806e9e9c3aa01029f6bae3ada0729 Mon Sep 17 00:00:00 2001 From: Paul Eggleton <paul.eggleton@linux.intel.com> Date: Tue, 17 Jul 2012 11:27:39 +0100 Subject: [PATCH] Log the SELinux context at startup. @@ -14,7 +14,7 @@ Note: unlikely to be any interest in this upstream 2 files changed, 31 insertions(+) diff --git a/configure.in b/configure.in -index 352711a..f58620f 100644 +index 6319903..bffd8a1 100644 --- a/configure.in +++ b/configure.in @@ -514,6 +514,11 @@ gettid @@ -30,7 +30,7 @@ index 352711a..f58620f 100644 # On Linux before glibc 2.30, gettid() is only usable via syscall() AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid, diff --git a/server/core.c b/server/core.c -index 30b317e..81f145f 100644 +index 3b50100..e0c7c7f 100644 --- a/server/core.c +++ b/server/core.c @@ -65,6 +65,10 @@ @@ -44,7 +44,7 @@ index 30b317e..81f145f 100644 /* LimitRequestBody handling */ #define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1) #define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */ -@@ -5139,6 +5143,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte +@@ -5162,6 +5166,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte } #endif @@ -73,5 +73,3 @@ index 30b317e..81f145f 100644 return OK; } --- -2.40.0 diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch index dc5b5c88f2..4bc2ad6d3e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2/0008-Fix-perl-install-directory-to-usr-bin.patch @@ -1,4 +1,4 @@ -From 443d15b91d4e4979d92405610303797663f31102 Mon Sep 17 00:00:00 2001 +From 980eadecc128bbbe1233e5d89268be24d14e1873 Mon Sep 17 00:00:00 2001 From: echo <fei.geng@windriver.com> Date: Tue, 28 Apr 2009 03:11:06 +0000 Subject: [PATCH] Fix perl install directory to /usr/bin @@ -16,10 +16,10 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com> 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/configure.in b/configure.in -index 4df3ff3..4eeb609 100644 +index 4ce0fee..0362f52 100644 --- a/configure.in +++ b/configure.in -@@ -903,10 +903,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", +@@ -936,10 +936,7 @@ AC_DEFINE_UNQUOTED(SERVER_CONFIG_FILE, "${rel_sysconfdir}/${progname}.conf", AC_DEFINE_UNQUOTED(AP_TYPES_CONFIG_FILE, "${rel_sysconfdir}/mime.types", [Location of the MIME types config file, relative to the Apache root directory]) @@ -31,6 +31,3 @@ index 4df3ff3..4eeb609 100644 AC_SUBST(perlbin) dnl If we are running on BSD/OS, we need to use the BSD .include syntax. --- -2.25.1 - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb index 1632c6ccb1..7d6ea27e7e 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.59.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/apache2/apache2_2.4.62.bb @@ -27,7 +27,7 @@ SRC_URI:append:class-target = " \ " LIC_FILES_CHKSUM = "file://LICENSE;md5=bddeddfac80b2c9a882241d008bb41c3" -SRC_URI[sha256sum] = "ec51501ec480284ff52f637258135d333230a7d229c3afa6f6c2f9040e321323" +SRC_URI[sha256sum] = "674188e7bf44ced82da8db522da946849e22080d73d16c93f7f4df89e25729ec" S = "${WORKDIR}/httpd-${PV}" @@ -37,12 +37,20 @@ DEPENDS = "openssl expat pcre apr apr-util apache2-native " CVE_PRODUCT = "apache:http_server" +CVE_STATUS[CVE-1999-0289] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows" +CVE_STATUS[CVE-2007-0450] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows." +CVE_STATUS[CVE-2007-6421] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)" +CVE_STATUS[CVE-2007-6422] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2 (incl.) to 2.2.8 (excl.)" +CVE_STATUS[CVE-2007-6423] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions from 2.2.x to 2.2.7-dev" +CVE_STATUS[CVE-2008-2168] = "cpe-incorrect: The current version (2.4.59) is not affected by the CVE which affects versions up to 2.2.6 (excl.)" +CVE_STATUS[CVE-2010-0425] = "not-applicable-platform: The current version (2.4.6) is not affected. It only applies for Windows." + SSTATE_SCAN_FILES += "apxs config_vars.mk config.nice" PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'selinux', d)}" PACKAGECONFIG[selinux] = "--enable-selinux,--disable-selinux,libselinux,libselinux" PACKAGECONFIG[openldap] = "--enable-ldap --enable-authnz-ldap,--disable-ldap --disable-authnz-ldap,openldap" -PACKAGECONFIG[zlib] = "--enable-deflate,,zlib,zlib" +PACKAGECONFIG[zlib] = "--enable-deflate --with-zlib=${STAGING_LIBDIR}/../,,zlib,zlib" CFLAGS:append = " -DPATH_MAX=4096" @@ -182,6 +190,10 @@ INITSCRIPT_PARAMS = "defaults 91 20" SYSTEMD_SERVICE:${PN} = "apache2.service" SYSTEMD_AUTO_ENABLE:${PN} = "enable" +ALTERNATIVE:${PN} = "httpd" +ALTERNATIVE_LINK_NAME[httpd] = "${sbindir}/httpd" +ALTERNATIVE_PRIORITY[httpd] = "60" + ALTERNATIVE:${PN}-doc = "htpasswd.1" ALTERNATIVE_LINK_NAME[htpasswd.1] = "${mandir}/man1/htpasswd.1" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb index 5bf6373a81..f10262366a 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/monkey/monkey_1.6.9.bb @@ -90,3 +90,4 @@ CONFFILES:${PN} = "${sysconfdir}/monkey/monkey.conf \ ${sysconfdir}/monkey/plugins/auth/monkey.users \ " +CVE_STATUS[CVE-2013-2183] = "cpe-incorrect: Current version (1.6.9) is not affected. Issue was addressed in version 1.3.0" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc index 2714c3d22f..bcc384bd8a 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx.inc @@ -38,7 +38,7 @@ NGINX_USER ?= "www" EXTRA_OECONF = "" DISABLE_STATIC = "" -PACKAGECONFIG ??= "ssl ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" +PACKAGECONFIG ??= "ssl fastcgi scgi uwsgi ${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[gunzip] = "--with-http_gunzip_module,," PACKAGECONFIG[http2] = "--with-http_v2_module,," @@ -48,7 +48,9 @@ PACKAGECONFIG[ipv6] = "--with-ipv6,," PACKAGECONFIG[webdav] = "--with-http_dav_module,," PACKAGECONFIG[stream] = "--with-stream,," PACKAGECONFIG[http-sub-module] = "--with-http_sub_module,," - +PACKAGECONFIG[fastcgi] = ",--without-http_fastcgi_module," +PACKAGECONFIG[scgi] = ",--without-http_scgi_module," +PACKAGECONFIG[uwsgi] = ",--without-http_uwsgi_module," PACKAGECONFIG[xslt] = "--with-http_xslt_module,,libxslt" do_configure () { @@ -81,9 +83,9 @@ do_configure () { --error-log-path=${localstatedir}/log/nginx/error.log \ --http-client-body-temp-path=/run/nginx/client_body_temp \ --http-proxy-temp-path=/run/nginx/proxy_temp \ - --http-fastcgi-temp-path=/run/nginx/fastcgi_temp \ - --http-uwsgi-temp-path=/run/nginx/uwsgi_temp \ - --http-scgi-temp-path=/run/nginx/scgi_temp \ + ${@bb.utils.contains('PACKAGECONFIG', 'fastcgi', '--http-fastcgi-temp-path=/run/nginx/fastcgi_temp', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'scgi', '--http-scgi-temp-path=/run/nginx/scgi_temp', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'uwsgi', '--http-uwsgi-temp-path=/run/nginx/uwsgi_temp', '', d)} \ --pid-path=/run/nginx/nginx.pid \ --prefix=${prefix} \ --with-threads \ @@ -132,6 +134,18 @@ do_install () { # cleanup configuration folder rm ${D}${sysconfdir}/nginx/*.default + # remove config files based on packageconfig + if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'fastcgi', d)}" ]; then + rm -f ${D}${sysconfdir}/nginx/fastcgi.conf + rm -f ${D}${sysconfdir}/nginx/fastcgi_params + fi + if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'scgi', d)}" ]; then + rm -f ${D}${sysconfdir}/nginx/scgi_params + fi + if ! [ "${@bb.utils.filter('PACKAGECONFIG', 'uwsgi', d)}" ]; then + rm -f ${D}${sysconfdir}/nginx/uwsgi_params + fi + # add additional configuration folders install -d ${D}${sysconfdir}/nginx/modules-available install -d ${D}${sysconfdir}/nginx/modules-enabled diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb deleted file mode 100644 index d0371dd3cc..0000000000 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.25.3.bb +++ /dev/null @@ -1,10 +0,0 @@ -require nginx.inc - -# 1.24.x branch is the current stable branch, the recommended default -# 1.25.x is the current mainline branches containing all new features -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://LICENSE;md5=79ad2eb837299421c4435dedc8897b3d" - -SRC_URI[sha256sum] = "64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86" - diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb index 0ce940d429..a279a3cf9b 100644 --- a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.26.0.bb +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.26.2.bb @@ -2,5 +2,5 @@ require nginx.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" -SRC_URI[sha256sum] = "d2e6c8439d6c6db5015d8eaab2470ab52aef85a7bf363182879977e084370497" +SRC_URI[sha256sum] = "627fe086209bba80a2853a0add9d958d7ebbdffa1a8467a5784c9a6b4f03d738" diff --git a/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb new file mode 100644 index 0000000000..5927ecab02 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-httpd/nginx/nginx_1.27.1.bb @@ -0,0 +1,10 @@ +require nginx.inc + +# 1.26.x branch is the current stable branch, the recommended default +# 1.27.x is the current mainline branches containing all new features +DEFAULT_PREFERENCE = "-1" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=a6547d7e5628787ee2a9c5a3480eb628" + +SRC_URI[sha256sum] = "bd7ba68a6ce1ea3768b771c7e2ab4955a59fb1b1ae8d554fedb6c2304104bdfc" + diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch new file mode 100644 index 0000000000..d8ad69ceca --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/0001-cmake-Add-check-for-64bit-builtin-atomics.patch @@ -0,0 +1,51 @@ +From 1e8fbb6da4e5ee44fe24c078aae1930d759f0ba3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 Sep 2024 05:29:13 +0000 +Subject: [PATCH] cmake: Add check for 64bit builtin atomics + +Compilers for some architectures e.g. RISCV32 do not have 64bit atomics +therefore, its important to deduce that and use it to pass right flags to +compiler to use them, e.g. h2o module + +Fixes +nection.c.o): in function `h2o_create_connection': +| /usr/src/debug/netdata/1.47.1/src/web/server/h2o/libh2o/include/h2o.h:1917:(.text.create_conn+0x5e): undefined reference to `__sync_add_and_fetch_8' +| collect2: error: ld returned 1 exit status + +Upstream-Status: Submitted [https://github.com/netdata/netdata/pull/18565] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + CMakeLists.txt | 13 +++++++++++++ + 1 file changed, 13 insertions(+) + +Index: netdata-v1.47.1/CMakeLists.txt +=================================================================== +--- netdata-v1.47.1.orig/CMakeLists.txt ++++ netdata-v1.47.1/CMakeLists.txt +@@ -448,6 +448,15 @@ int main() { + } + " HAVE_BUILTIN_ATOMICS) + ++check_cxx_source_compiles(" ++#include <stdint.h> ++int main(void) { ++ uint64_t a; ++ __sync_add_and_fetch(&a, 1); ++ return 0; ++} ++" ARCH_SUPPORTS_64BIT_ATOMICS) ++ + check_c_source_compiles(" + void my_printf(char const *s, ...) __attribute__((format(gnu_printf, 1, 2))); + int main() { return 0; } +@@ -523,6 +532,10 @@ if(OS_FREEBSD OR OS_MACOS) + set(HAVE_BUILTIN_ATOMICS True) + endif() + ++if (ENABLE_H2O AND NOT ARCH_SUPPORTS_64BIT_ATOMICS) ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DH2O_NO_64BIT_ATOMICS") ++endif (NOT ARCH_SUPPORTS_64BIT_ATOMICS) ++ + # openssl/crypto + set(ENABLE_OPENSSL True) + pkg_check_modules(TLS IMPORTED_TARGET openssl) diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf new file mode 100644 index 0000000000..f342542077 --- /dev/null +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata/netdata-volatiles.conf @@ -0,0 +1,5 @@ +d /run/netdata 0755 netdata netdata - +d /var/cache/netdata 0755 netdata netdata - +d /var/lib/netdata/cloud.d 0755 netdata netdata - +d /var/lib/netdata/registry 0755 netdata netdata - +d /var/log/netdata 0755 netdata netdata - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb index b06a5df314..5b38d401cd 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.44.3.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/netdata/netdata_1.47.1.bb @@ -5,15 +5,16 @@ HOMEPAGE = "https://github.com/netdata/netdata/" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=fc9b848046ef54b5eaee6071947abd24" -DEPENDS += "json-c libuv libyaml util-linux zlib " +DEPENDS += "json-c libuv libyaml util-linux zlib lz4" SRC_URI = "\ https://github.com/${BPN}/${BPN}/releases/download/v${PV}/${BPN}-v${PV}.tar.gz \ + file://0001-cmake-Add-check-for-64bit-builtin-atomics.patch \ file://netdata.conf \ file://netdata.service \ + file://netdata-volatiles.conf \ " - -SRC_URI[sha256sum] = "50df30a9aaf60d550eb8e607230d982827e04194f7df3eba0e83ff7919270ad2" +SRC_URI[sha256sum] = "fb970a4b571ffd542b7d24220ef806a4c1b56c535e0f549a9978860a9f1dcc9c" UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/tags" UPSTREAM_CHECK_REGEX = "${BPN}/releases/tag/v(?P<pver>\d+(?:\.\d+)*)" @@ -23,7 +24,9 @@ S = "${WORKDIR}/${BPN}-v${PV}" # Stop sending anonymous statistics to Google Analytics NETDATA_ANONYMOUS ??= "enabled" -inherit pkgconfig autotools-brokensep useradd systemd +inherit pkgconfig cmake useradd systemd + +TARGET_CC_ARCH:append:libc-musl = " -D_LARGEFILE64_SOURCE" LIBS:toolchain-clang:x86 = "-latomic" LIBS:riscv64 = "-latomic" @@ -40,23 +43,32 @@ SYSTEMD_AUTO_ENABLE:${PN} = "enable" USERADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "--system --no-create-home --home-dir ${localstatedir}/run/netdata --user-group netdata" -PACKAGECONFIG ??= "openssl" -PACKAGECONFIG[cloud] = "--enable-cloud, --disable-cloud," -PACKAGECONFIG[lz4] = "--enable-lz4, --disable-lz4, lz4" -PACKAGECONFIG[openssl] = "--enable-openssl, --disable-openssl, openssl" +PACKAGECONFIG ??= "openssl freeipmi ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" +PACKAGECONFIG[brotli] = ",,brotli" +PACKAGECONFIG[cloud] = "-DENABLE_CLOUD=ON,-DENABLE_CLOUD=OFF," +PACKAGECONFIG[openssl] = "-DENABLE_OPENSSL=ON,-DENABLE_OPENSSL=OFF,openssl" +PACKAGECONFIG[freeipmi] = "-DENABLE_PLUGIN_FREEIPMI=ON,-DENABLE_PLUGIN_FREEIPMI=OFF,freeipmi" +PACKAGECONFIG[nfacct] = "-DENABLE_PLUGIN_NFACCT=ON,-DENABLE_PLUGIN_NFACCT=OFF,libmnl" +# needs meta-virtualization +PACKAGECONFIG[xenstat] = "-DENABLE_PLUGIN_XENSTAT=ON,-DENABLE_PLUGIN_XENSTAT=OFF,xen-tools" +PACKAGECONFIG[cups] = "-DENABLE_PLUGIN_CUPS=ON,-DENABLE_PLUGIN_CUPS=OFF,cups" +PACKAGECONFIG[systemd] = "-DENABLE_PLUGIN_SYSTEMD_JOURNAL=ON,-DENABLE_PLUGIN_SYSTEMD_JOURNAL=OFF,systemd" # ebpf doesn't compile (or detect) the cross compilation well -EXTRA_OECONF += "--disable-ebpf" +EXTRA_OECMAKE += "-DENABLE_PLUGIN_EBPF=OFF -DENABLE_PLUGIN_GO=OFF \ + -DENABLE_ACLK=OFF -DENABLE_EXPORTER_PROMETHEUS_REMOTE_WRITE=OFF -DCMAKE_INSTALL_PREFIX='${base_prefix}'" do_install:append() { #set S UID for plugins chmod 4755 ${D}${libexecdir}/netdata/plugins.d/apps.plugin + rm -rf ${D}/${localstatedir}/ if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then # Install systemd unit files install -d ${D}${systemd_unitdir}/system install -m 0644 ${UNPACKDIR}/netdata.service ${D}${systemd_unitdir}/system sed -i -e 's,@@datadir,${datadir_native},g' ${D}${systemd_unitdir}/system/netdata.service + install -Dm 0644 ${UNPACKDIR}/netdata-volatiles.conf ${D}${sysconfdir}/tmpfiles.d/netdata.conf fi # Install default netdata.conf diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch index 1ca26ca0dd..46b1f7c7b8 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/disable-version-check.patch @@ -7,58 +7,44 @@ Upstream-Status: Inappropriate Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Index: webmin-1.850/webmin/webmin-lib.pl -=================================================================== ---- webmin-1.850.orig/webmin/webmin-lib.pl -+++ webmin-1.850/webmin/webmin-lib.pl -@@ -1112,28 +1112,28 @@ my %miniserv; +--- a/webmin/webmin-lib.pl ++++ b/webmin/webmin-lib.pl +@@ -1170,38 +1170,6 @@ my %miniserv; + &get_miniserv_config(\%miniserv); &load_theme_library(); # So that UI functions work - # Need OS upgrade --my %realos = &detect_operating_system(undef, 1); --if (($realos{'os_version'} ne $gconfig{'os_version'} || -- $realos{'os_type'} ne $gconfig{'os_type'}) && -- $realos{'os_version'} && $realos{'os_type'} && -- &foreign_available("webmin")) { -- my ($realminor) = split(/\./, $realos{'os_version'}); -- my ($minor) = split(/\./, $gconfig{'os_version'}); -- if ($realos{'os_type'} eq $gconfig{'os_type'} && -- $realminor == $minor) { -- # Only the minor version number changed - no need to apply -- &apply_new_os_version(\%realos); +-# Need OS upgrade, but only once per day or if the system was rebooted +-my $now = time(); +-my $uptime = &get_system_uptime(); +-if (&foreign_available("webmin")) { +- my %realos; +- my @st = stat($realos_cache_file); +- if (!@st || $now - $st[9] > 24*60*60 || +- $uptime && $now - $st[9] > $uptime) { +- %realos = &detect_operating_system(undef, 1); +- &write_file($realos_cache_file, \%realos); - } - else { -- # Large enough change to tell the user -- push(@notifs, -- &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -- &text('os_incorrect', $realos{'real_os_type'}, -- $realos{'real_os_version'})."<p>\n". +- &read_file($realos_cache_file, \%realos); +- } +- if (($realos{'os_version'} ne $gconfig{'os_version'} || +- $realos{'real_os_version'} ne $gconfig{'real_os_version'} || +- $realos{'os_type'} ne $gconfig{'os_type'}) && +- $realos{'os_version'} && $realos{'os_type'} && +- &foreign_available("webmin")) { +- # Tell the user that OS version was updated +- push(@notifs, +- &ui_form_start("@{[&get_webprefix()]}/webmin/fix_os.cgi"). +- &text('os_incorrect', +- $realos{'real_os_type'}, +- $realos{'real_os_version'}). +- &show_os_release_notes($realos{'real_os_version'}). +- "<p>\n". - &ui_form_end([ [ undef, $text{'os_fix'} ] ]) - ); - } - } -+#my %realos = &detect_operating_system(undef, 1); -+#if (($realos{'os_version'} ne $gconfig{'os_version'} || -+# $realos{'os_type'} ne $gconfig{'os_type'}) && -+# $realos{'os_version'} && $realos{'os_type'} && -+# &foreign_available("webmin")) { -+# my ($realminor) = split(/\./, $realos{'os_version'}); -+# my ($minor) = split(/\./, $gconfig{'os_version'}); -+# if ($realos{'os_type'} eq $gconfig{'os_type'} && -+# $realminor == $minor) { -+# # Only the minor version number changed - no need to apply -+# &apply_new_os_version(\%realos); -+# } -+# else { -+# # Large enough change to tell the user -+# push(@notifs, -+# &ui_form_start("$gconfig{'webprefix'}/webmin/fix_os.cgi"). -+# &text('os_incorrect', $realos{'real_os_type'}, -+# $realos{'real_os_version'})."<p>\n". -+# &ui_form_end([ [ undef, $text{'os_fix'} ] ]) -+# ); -+# } -+# } - +- # Password close to expiry my $warn_days = $config{'warn_days'}; + if (&foreign_check("acl")) { diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch index 787bd8c69b..7d6a2275f9 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mount-excludefs.patch @@ -8,9 +8,9 @@ Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Upstream-Status: Pending ---- webmin-1.570.orig/mount/index.cgi -+++ webmin-1.570/mount/index.cgi -@@ -33,10 +33,12 @@ elsif ($config{'sort_mode'} == 1) { +--- a/mount/index.cgi ++++ b/mount/index.cgi +@@ -34,9 +34,11 @@ elsif ($config{'sort_mode'} == 1) { } # Build visible filesystems list @@ -18,7 +18,6 @@ Upstream-Status: Pending foreach $m (@all) { @minfo = @$m; $p = &simplify_mount_path($minfo[0], $minfo[2]); - next if ($ignore{$minfo[2]}); + next if (grep {$_ eq $minfo[2]} @excludefs); @mmodes = &mount_modes($minfo[2], $minfo[0], $minfo[1]); $canedit = $can_edit{$minfo[2]} && !$mmodes[4] && diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch index c6c1f0df79..d62353592e 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/mysql-config-fix.patch @@ -10,8 +10,6 @@ Signed-off-by: Diego Rondini <diego.ml@zoho.com> mysql/config | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) -diff --git a/mysql/config b/mysql/config -index e5b6fb3..77bfe69 100644 --- a/mysql/config +++ b/mysql/config @@ -1,13 +1,13 @@ @@ -33,7 +31,7 @@ index e5b6fb3..77bfe69 100644 -mysqladmin=/usr/local/mysql/bin/mysqladmin +mysql_libs=/usr/lib +mysqladmin=/usr/bin/mysqladmin - style=0 + style=1 add_mode=1 nodbi=0 @@ -15,7 +15,7 @@ access=*: * @@ -45,6 +43,3 @@ index e5b6fb3..77bfe69 100644 max_dbs=50 my_cnf=/etc/my.cnf max_text=1000 --- -2.5.0 - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch index 6ae3dced72..f1965a7887 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-generic.patch @@ -3,23 +3,19 @@ Add support for configuring network interfaces on a generic linux system Upstream-Status: Inappropriate [config] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> -Index: webmin-1.850/net/module.info -=================================================================== ---- webmin-1.850.orig/net/module.info -+++ webmin-1.850/net/module.info -@@ -14,7 +14,7 @@ desc_ko_KR.UTF-8=네트워크 구성 +--- a/net/module.info ++++ b/net/module.info +@@ -1,7 +1,7 @@ + version=2.202 + longdesc=Configure boot time and active interfaces, DNS, routing and /etc/hosts. name=Networking - desc_tr=A Yaplandrmas - desc_de=Netzwerkkonfiguration -os_support=solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux +os_support=generic-linux solaris coherent-linux redhat-linux/5.0-* mandrake-linux united-linux suse-linux/6.0-* open-linux unixware turbo-linux/4.0 freebsd/3.2-* openbsd debian-linux/2.2-* cobalt-linux/2.2-* msc-linux gentoo-linux macos/1.5-* trustix-linux slackware-linux/8.0-* openmamba-linux cygwin windows pardus-linux - desc_sk=Konfigurcia siete - desc_zh_CN= - risk=low medium high -Index: webmin-1.850/net/generic-linux-lib.pl -=================================================================== + readonly=1 + desc=Network Configuration + category=net --- /dev/null -+++ webmin-1.850/net/generic-linux-lib.pl ++++ b/net/generic-linux-lib.pl @@ -0,0 +1,2 @@ +do 'linux-lib.pl'; + diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch index bdba5e73f8..949525dfd7 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/net-lib.pl.patch @@ -4,16 +4,14 @@ XXX: need to work out a better fix. Signed-off-by: Dexuan Cui <dexuan.cui@intel.com> -diff -Nru webmin-1.570.orig//net/net-lib.pl webmin-1.570/net/net-lib.pl ---- webmin-1.570.orig//net/net-lib.pl 2011-10-03 09:01:48.000000000 +0800 -+++ webmin-1.570/net/net-lib.pl 2011-10-28 13:52:56.138873664 +0800 -@@ -21,7 +21,8 @@ - do "$gconfig{'os_type'}-9.1-ALL-lib.pl"; +--- a/net/net-lib.pl ++++ b/net/net-lib.pl +@@ -38,7 +38,7 @@ elsif ($gconfig{'os_type'} eq 'debian-li + $net_mode = "netplan"; } else { - do "$gconfig{'os_type'}-lib.pl"; -+ #do "$gconfig{'os_type'}-lib.pl"; + do "debian-linux-lib.pl"; + $net_mode = $gconfig{'os_type'}; } - # list_hosts() diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch deleted file mode 100644 index 75e5bd1eaf..0000000000 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/remove-python2.3.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 6f04699d5d417122b67e8118fd1955c769f17e76 Mon Sep 17 00:00:00 2001 -From: Robert Yang <liezhi.yang@windriver.com> -Date: Tue, 2 Sep 2014 00:11:05 -0700 -Subject: [PATCH] ajaxterm/ajaxterm/qweb.py: fix hardcode of python2.3 - -Upstream-Status: Pending - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> ---- - ajaxterm/ajaxterm/qweb.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ajaxterm/ajaxterm/qweb.py b/ajaxterm/ajaxterm/qweb.py -index 20c5092..c658a6b 100644 ---- a/ajaxterm/ajaxterm/qweb.py -+++ b/ajaxterm/ajaxterm/qweb.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.3 -+#!/usr/bin/env python - # - # vim:set et ts=4 fdc=0 fdn=2 fdl=0: - # --- -1.7.9.5 - diff --git a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb index bbc59443c7..18082149b6 100644 --- a/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_1.850.bb +++ b/meta-openembedded/meta-webserver/recipes-webadmin/webmin/webmin_2.202.bb @@ -1,7 +1,7 @@ SUMMARY = "Web-based administration interface" HOMEPAGE = "http://www.webmin.com" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENCE;md5=0373ac9f611e542ddebe1ec6394afc3c" +LIC_FILES_CHKSUM = "file://LICENCE;md5=0a6446108c96d0819d21e40b48109507" SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://setup.sh \ @@ -16,14 +16,10 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/webadmin/webmin-${PV}.tar.gz \ file://proftpd-config-fix.patch \ file://net-lib.pl.patch \ file://media-tomb.patch \ - file://remove-python2.3.patch \ file://mysql-config-fix.patch \ file://webmin.service \ " - -SRC_URI[md5sum] = "cd6ee98f73f9418562197675b952d81b" -SRC_URI[sha256sum] = "c66caa9e4cb50d5447bc8aceb7989d2284dde060278f404b13e171c7ce1690e1" - +SRC_URI[sha256sum] = "4f1c467aeda0ded546e69f332c768665b6a0537d6a69e609221f9465121f775e" UPSTREAM_CHECK_URI = "http://www.webmin.com/download.html" UPSTREAM_CHECK_REGEX = "webmin-(?P<pver>\d+(\.\d+)+).tar.gz" diff --git a/meta-openembedded/meta-xfce/README.md b/meta-openembedded/meta-xfce/README.md index 3d6158628f..862cf541f9 100644 --- a/meta-openembedded/meta-xfce/README.md +++ b/meta-openembedded/meta-xfce/README.md @@ -1,10 +1,10 @@ This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: master +branch: styhead URI: git://git.openembedded.org/meta-openembedded -branch: master +branch: styhead meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository. @@ -13,10 +13,9 @@ this to local.conf: BBMASK = "meta-xfce/recipes-multimedia" -Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce]' in the subject' +Send pull requests to openembedded-devel@lists.openembedded.org with '[meta-xfce][styhead]' in the subject' When sending single patches, please using something like: -git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][PATCH' +git send-email -M -1 --to openembedded-devel@lists.openembedded.org --subject-prefix='meta-xfce][styhead][PATCH' -Layer maintainer: Kai Kang <kai.kang@windriver.com> -Layer maintainer: Andreas Müller <schnitzeltony@gmail.com> +Layer maintainer: Armin Kuster <akuster808@gmail.com> diff --git a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb index f2e04f7932..500719a8f6 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb @@ -49,7 +49,7 @@ RRECOMMENDS:${PN} = " \ xfce4-verve-plugin \ \ ${@bb.utils.contains('DISTRO_FEATURES','polkit','xfce-polkit','',d)} \ - ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection", "blueman", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "bluetooth gobject-introspection-data", "blueman", "", d)} \ \ thunar-media-tags-plugin \ thunar-archive-plugin \ diff --git a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.5.bb index 7e70754431..8e4e4966c4 100644 --- a/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.3.bb +++ b/meta-openembedded/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.18.5.bb @@ -14,7 +14,7 @@ SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ file://0002-use-lxdm-to-replace-dm-tool.patch \ " -SRC_URI[sha256sum] = "4ae0b8615c9811194bbda0172a63567ed7fdb5519ea48f7a4637f4e6e5365e1b" +SRC_URI[sha256sum] = "b20e0d10cc5149a601d8eee07373efb446ea3e179dd032ed8ddb5782e3f9e7cb" EXTRA_OECONF += "--disable-vala" |